Deleted a lot of code

Deleted code that was not being used, and some of the images too.

7 files changed, 0 insertions, 425 deletions

diff --git a/gamemode/server/heatmap.lua b/gamemode/server/heatmap.lua
deleted file mode 100644
index 1e95590..0000000
--- a/gamemode/server/heatmap.lua
+++ /dev/null
@@ -1,139 +0,0 @@
---[[
-    Some helper methods for useing heatmaps
-]]
-do return end
-print("Hello from heatmap.lua!")
-local prs = pairs
-local tblins,tbldel = table.insert, table.remove
-local pow,sqrt,max = math.pow, math.sqrt, math.max
-
-heatmap = {}
-
--- local function VectorDistance(vec1,vec2)
---     if vec1.Distance then return vec1:Distance(vec2)
---     else
---         local dist = 0
---         for k,v in prs(vec1) do
---             local add = pow(vec1[k]-vec2[k],2)
---             dist = dist + add
---         end
---         dist = sqrt(dist)
---         return dist
---     end
--- end
-
-local function VectorLength(vec)
-    if vec.Length then return vec:Length()
-    else
-        local len = 0
-        for k,v in prs do
-            local add = pow(v,2)
-            len = len + add
-        end
-        len = sqrt(len)
-        return len
-    end
-end
-
-
-local function RegisterEffect(self, func, position)
-    local stbl = {position,func}
-    tblins(self.heatpoints,#self.heatpoints + 1,stbl)
-end
-
-local function CalculateFor(self, position)
-    local sh = self.heatpoints[1]
-    local total = sh[2](sh[1]-position,self.curtime)
-    for k = 2,#self.heatpoints do
-        sh = self.heatpoints[k]
-        total, shouldremove = total + sh[2](sh[1]-position,self.curtime)
-        if shouldremove then tbldel(k) end
-    end
-    return total
-end
-
---- Creates a heat map to keep track of effects.
--- Effects must be structured as a function that takes a vector (position from origin of effect) and number(time) and returns a value
--- @return a heatmap object
-function heatmap.CreateHeatMap()
-    local tbl = {}
-    tbl.heatpoints = {}
-    tbl.curtime = 0
-    tbl.RegisterEffect = RegisterEffect
-    tbl.CalculateFor = CalculateFor
-    return tbl
-end
-
-function heatmap.UniformInfiniteForever(field)
-    return function(vector, time)
-        return field, false
-    end
-end
-
-function heatmap.UniformInfiniteLinearDecay(field,decayrate)
-    return function(vector,time)
-        return heatmap.UniformInfiniteForever(field) - (time * decayrate), false
-    end
-end
-
-function heatmap.UniformInfiniteLinearDecayGrounded(field,decayrate)
-    local removetime = field / decayrate
-    return function(vector,time)
-        return max(heatmap.UniformInfiniteLinearDecay(field,decayrate),0), time < removetime
-    end
-end
-
-function heatmap.LinearInfiniteForever(field)
-    return function(vector, time)
-        return field - VectorLength(vector), false
-    end
-end
-
-function heatmap.LinearInfiniteForeverGrounded(field)
-    return function(vector,time)
-        return max(heatmap.LinearInfiniteForever(field),0), false
-    end
-end
-
-function heatmap.LinearInfiniteLinearDecay(field,decayrate)
-    return function(vector, time)
-        return field - VectorLength(vector) - (time * decayrate), false
-    end
-end
-
-function heatmap.LinearInfiniteLinearDecayGrounded(field,decayrate)
-    local removetime = field / decayrate
-    return function(vector, time)
-        return max(field-VectorLength(vector) - (time * decayrate),0), time < removetime
-    end
-end
-
-function heatmap.ParabolicInfiniteForever(field, power)
-    return function(vector, time)
-        return field - pow(VectorLength(vector),power) / pow(100,power), false
-    end
-end
-
-function heatmap.ParabolicInfiniteForeverGrounded(field, power)
-    return function(vector, time)
-        local pre = heatmap.ParabolicInfiniteForever(field, power)
-        --print("pre is:")
-        --print(pre)
-        return max(pre,0), false
-    end
-end
-
-function heatmap.ParabolicInfiniteLinearDecay(field,power,decayrate)
-    return function(vector, time)
-        return heatmap.ParabolicInfiniteForever(field, power) - (time * decayrate), false
-    end
-end
-
-function heatmap.ParabolicInfiniteLinearDecayGrounded(field,power,decayrate)
-    local removetime = field / decayrate
-    return function(vector,time)
-        return max(heatmap.ParabolicInfiniteLinearDecay(field,power,decayrate),0), time < removetime
-    end
-end
-
-return heatmap
diff --git a/gamemode/server/sv_config.lua b/gamemode/server/sv_config.lua
deleted file mode 100644
index 8ce6e6c..0000000
--- a/gamemode/server/sv_config.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---[[
-    Some things that I might want to configure
-]]
-do return end
--- ART.defaults = {}
--- ART.defaults.starting_inventory = '{"Backpacks":[[[[false,false,false,false,false],[false,false,false,false,false],[false,false,false,false,false],[false,false,false,false,false],[false,false,false,false,false]],[5,5],"Rucksack"]],"Credits":0,"Equiped":{"Gloves":false,"Left":false,"Boots":false,"Legs":false,"Right":false,"Body":false,"Head":false},"Prayers":{"Noob Help":true}}'
--- ART.defaults.starting_skills = "[]"
--- ART.defaults.starting_quests = "[]"
--- ART.defaults.starting_prayers = "[]" --This dosen't actually do anything, remove it at some point.
--- 
--- ART.defaults.starting_position = "185 310 524"
--- ART.defaults.starting_world = "0.0.0.0:27015"
--- ART.config = {}
--- ART.config.server_world = game.GetIPAddress()
--- 
--- local mysqlconfig = file.Read("artery/mysql.txt")
--- for _,line in pairs(string.Explode("\n",mysqlconfig,false)) do
---     --print(line)
---     local key, value = unpack(string.Explode("=",line,false))
---     --print("setting",key,"to",value)
---     ART.config[key] = value
--- end
diff --git a/gamemode/server/sv_mapchange.lua b/gamemode/server/sv_mapchange.lua
deleted file mode 100644
index 895b086..0000000
--- a/gamemode/server/sv_mapchange.lua
+++ /dev/null
@@ -1,154 +0,0 @@
---[[
-    A script to move the player to a different map
-]]
-do return end
--- local fn = nrequire("utility/fn.lua")
--- local q = nrequire("core/database/queries.lua")
--- nrequire("sv_mysqlite.lua")
--- local mapname = game.GetMap()
--- local mapareasstr = file.Read("artery/maps/" .. mapname .. "/mapareas.txt")
-
---[=[
-local dontupdatedisconnect = {}
-
-hook.Add("InitPostEntity", "LoadMapChangePoints", function()
-    local transfers = string.Explode("\r?\n\r?\n",mapareasstr,true)
-    for k,v in pairs(transfers) do
-        local parts = string.Explode("\r?\n",v,true)
-        local vectortxt = string.Explode(" ",parts[1],false)
-        local svec = Vector(vectortxt[1],vectortxt[2],vectortxt[3])
-        local name = parts[2]
-        local server = parts[3]
-        local model = parts[4]
-        local tvt = string.Explode(" ",parts[5],false)
-
-        local sch = ents.Create("art_serverchanger")
-        sch.Model = model
-        sch.Pos = svec
-        sch.OnHit = function(self, coldata,collider)
-            print("Coldata")
-            PrintTable(coldata)
-            print("collider",collider)
-            if coldata.HitEntity:IsPlayer() then
-                dontupdatedisconnect[coldata.HitEntity] = true
-                local qc = table.concat({[[
-            UPDATE playerdata SET MetaData="]],
-                    tvt[1]," ",
-                    tvt[2]," ",
-                    tvt[3]," ",
-                    [[" WHERE SteamID="]],
-                    coldata.HitEntity:SteamID64(),
-                    '"'})
-				local query = [[
-				UPDATE playerdata SET PlayerData='%s',MetaData='%s' WHERE SteamID=%.0f
-				]]
-				local pdat = util.TableToJSON(coldata.HitEntity.data)
-				local pmet = util.TableToJSON({
-					lastserver = server,
-					lastlocation = parts[5]
-				})
-				print("pdat is", pdat)
-				print("pmet is", pmet)
-				local fquery = q.s_fmt(query,pdat,pmet,coldata.HitEntity:SteamID64())
-				print("fquery was", fquery)
-                print("Running query:",qc)
-                MySQLite.query(fquery,function(data)
-                    coldata.HitEntity:ConCommand("connect " .. server)
-                end,function(err,sql)
-                    print("Query error:")
-                    print("Query",sql)
-                    print("Error",err)
-                end)
-            end
-        end
-        sch:Spawn()
-        print("Loading mapchange area",svec)
-    end
-end)
-]=]
-
--- local function SavePlayerData(ply)
--- 	local query
--- 	local pdat = q.serialize_player(ply)
---     if dontupdatedisconnect[ply] then
---         dontupdatedisconnect[ply] = nil
--- 		query = [[
--- 		UPDATE playerdata SET PlayerData='%s' WHERE SteamID=%.0f
--- 		]]
--- 		query = q.s_fmt(query,pdat,ply:SteamID64())
---     else
--- 		query = [[
--- 		UPDATE playerdata SET PlayerData='%s' MetaData='%s' WHERE SteamID=%.0f
--- 		]]
--- 		local pmet = util.TableToJSON({
--- 			lastserver = game.GetIPAddress(),
--- 			lastlocation = ply:GetPos()
--- 		})
--- 		query = q.s_fmt(query,pdat,pmet,ply:SteamID64())
---     end
--- 	MySQLite.query(query,function(data)
--- 		
--- 	end,function(err,sql)
--- 		print("Query error:")
--- 		print("Query",sql)
--- 		print("Error",err)
--- 	end)
--- end
-
---[=[
-hook.Add("PlayerDisconnected","SavePlayerData",function(ply)
-    local qc
-    if dontupdatedisconnect[ply] then
-        dontupdatedisconnect[ply] = nil
-        qc = table.concat({
-            [[UPDATE artery.playerdata SET
-                Inventory="]],
-                util.TableToJSON(ply.Inventory),
-                [[",
-                Skills="]],
-                util.TableToJSON(ply.Skills),
-                [[",
-                Quests="]],
-                util.TableToJSON(ply.Quests),
-                [["
-                WHERE SteamID = "]],
-                ply:SteamID64(),
-                [[";]]
-        })
-    else
-        local pp = ply:GetPos()
-        qc = table.concat({
-            [[UPDATE artery.playerdata SET
-                Inventory="]],
-                util.TableToJSON(ply.Inventory),
-                [[",
-                Skills="]],
-                util.TableToJSON(ply.Skills),
-                [[",
-                Quests="]],
-                util.TableToJSON(ply.Quests),
-                [[",
-                WorldPosition="]],
-                pp[1]," ",pp[2]," ",pp[3],
-                [[",
-                World="]],
-                game.GetIPAddress(),
-                [["
-                WHERE SteamID = "]],
-                ply:SteamID64(),
-                [[";]]
-        })
-    end
-    local q = ART.database:query(qc)
-    function q:onSuccess(data)
-        print("Saveing player data successful")
-        PrintTable(data)
-    end
-    function q:onError(err, sql)
-        print("Saveing player data errored!")
-        print("Query",sql)
-        error(err)
-    end
-    q:start()
-end)
-]=]
diff --git a/gamemode/server/sv_mapconfig.lua b/gamemode/server/sv_mapconfig.lua
deleted file mode 100644
index d697ea9..0000000
--- a/gamemode/server/sv_mapconfig.lua
+++ /dev/null
@@ -1,68 +0,0 @@
--- --Loads map config form a file
--- do return end
--- function ART.CreateTownie(tbl)
---     local npcent = ents.Create("npc_townie")
---     for k,v in pairs(tbl) do
---         npcent[k] = v
---     end
---     npcent:Spawn()
--- end
--- 
--- function ART.CreateNavNode(tbl)
---     local nodeent = ents.Create("info_townienode")
---     assert(tbl ~= nil, "Tried to create a nil navnode")
---     for k,v in pairs(tbl) do
---         nodeent[k] = v
---     end
---     nodeent:Spawn()
--- end
--- 
--- local removeents = {
---     "npc_townie",
--- --    "art_chest",
---     "info_townienode",
---     "npc_shop",
--- }
--- 
--- for k,v in pairs(removeents) do
---     local eot = ents.FindByClass(v)
---     for i,j in pairs(eot) do
---         j:Remove()
---     end
--- end
--- 
--- local mapfields = {
---     "navnodes",
---     "npcs",
--- --    "chests",
--- }
--- 
--- local function loadMap()
---     for k,v in ipairs(mapfields) do
---         local mapname = game.GetMap()
---         local fpath = string.format("artery/maps/%s/%s/*", mapname, v)
---         local files,dirs = file.Find(fpath,"DATA")
---         for i,j in pairs(files) do
---             if string.GetExtensionFromFilename(j) ~= "lua" then continue end
---             local itempath = string.format("artery/maps/%s/%s/%s", mapname, v, j)
---             local itemtxt = file.Read(itempath, "DATA")
---             assert(itemtxt ~= nil, "Found a file, but it looks like it can't be compiled:" .. itempath)
---             CompileString(itemtxt,itempath)()
---         end
---     end
--- end
--- 
--- hook.Add( "InitPostEntity", "artery_spawnmapnpcs", function()
---     loadMap()
--- end )
--- 
--- concommand.Add("artery_reloadmap", function(ply,cmd,args)
---     if not ply:IsAdmin() then return end
---     for k,v in pairs(removeents) do
---         local eot = ents.FindByClass(v)
---         for i,j in pairs(eot) do
---             j:Remove()
---         end
---     end
---     loadMap()
--- end)
diff --git a/gamemode/server/sv_pac.lua b/gamemode/server/sv_pac.lua
deleted file mode 100644
index fc436f4..0000000
--- a/gamemode/server/sv_pac.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-hook.Add("PrePACConfigApply", "donators only", function(ply, outfit_data)
-    if not ply:IsSuperAdmin() then
-        return false, "give us money!"
-    end
-end)
-
-hook.Add( "PrePACEditorOpen", "RestrictToSuperadmin", function( ply )
-    return ply:IsSuperAdmin(), "This is accessable only to superadmins"
-end )
diff --git a/gamemode/server/sv_systems.lua b/gamemode/server/sv_systems.lua
deleted file mode 100644
index ad1b901..0000000
--- a/gamemode/server/sv_systems.lua
+++ /dev/null
@@ -1,21 +0,0 @@
---[[
-    Calculates various needs for the player, displayed in /gamemode/client/cl_systems.lua
-    Each need has a min and a max (ex health, stamina ect.)
-
-    Provides:
-        ART.RegisterSystem(string_name, table_system)
-            Registers the system with all players. Two systems may not share the same name.
-]]
-
-local pmeta = FindMetaTable("Player")
-
-pmeta.Systems = {}
-
-function ART.RegisterSystem(tbl)
-    assert(tbl.Name ~= nil,"Attempted to register a system with a nil name")
-    pmeta.Systems[name] = tbl
-end
-
-concommand.Add("DisplaySystems",function()
-    PrintTable(pmeta.Systems)
-end)
diff --git a/gamemode/server/systems/health.lua b/gamemode/server/systems/health.lua
deleted file mode 100644
index 7ead999..0000000
--- a/gamemode/server/systems/health.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-
-local SYSTEM = {}
-
-SYSTEM.onthink = function(ply)
-
-end
-
-SYSTEM.ontakedamage = function(ply)
-
-end
-
-return SYSTEM