diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-03-25 23:39:10 -0400 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-03-25 23:39:10 -0400 |
| commit | 7cef367ab340e39afe69f9b61203e11bfd2dce44 (patch) | |
| tree | d254b67a7ec95d58e52770bd39770ffcf2cd3247 /gamemode | |
| parent | 65016498e2ca0e87ad0617ecdfa0a2dce2cd1404 (diff) | |
| download | wintersurvival2-7cef367ab340e39afe69f9b61203e11bfd2dce44.tar.gz wintersurvival2-7cef367ab340e39afe69f9b61203e11bfd2dce44.tar.bz2 wintersurvival2-7cef367ab340e39afe69f9b61203e11bfd2dce44.zip | |
Updates to fences, and ai
Diffstat (limited to 'gamemode')
| -rw-r--r-- | gamemode/itemsystem/items/fence.lua | 3 | ||||
| -rw-r--r-- | gamemode/itemsystem/items/floor.lua | 1 | ||||
| -rw-r--r-- | gamemode/itemsystem/items/ramp.lua | 1 | ||||
| -rw-r--r-- | gamemode/npcsystem/npcs/antlion1.lua | 6 | ||||
| -rw-r--r-- | gamemode/npcsystem/npcs/antlion2.lua | 6 | ||||
| -rw-r--r-- | gamemode/npcsystem/npcs/zombie.lua | 6 |
6 files changed, 22 insertions, 1 deletions
diff --git a/gamemode/itemsystem/items/fence.lua b/gamemode/itemsystem/items/fence.lua index 2f2c5bf..2d767d4 100644 --- a/gamemode/itemsystem/items/fence.lua +++ b/gamemode/itemsystem/items/fence.lua @@ -8,7 +8,8 @@ ITEM.Recipe = { Resources = {
["Plank"] = 2,
["Sap"] = 1,
- }
+ },
+ Tools = {},
}
ITEM.Structure = {
diff --git a/gamemode/itemsystem/items/floor.lua b/gamemode/itemsystem/items/floor.lua index af3a0fd..bef9ad4 100644 --- a/gamemode/itemsystem/items/floor.lua +++ b/gamemode/itemsystem/items/floor.lua @@ -10,6 +10,7 @@ ITEM.Recipe = { ["Wood"] = 3,
["Sap"] = 1,
},
+ Tools = {},
}
ITEM.Structure = {
diff --git a/gamemode/itemsystem/items/ramp.lua b/gamemode/itemsystem/items/ramp.lua index 10575e2..1b4a29f 100644 --- a/gamemode/itemsystem/items/ramp.lua +++ b/gamemode/itemsystem/items/ramp.lua @@ -10,6 +10,7 @@ ITEM.Recipe = { ["Log"] = 1,
["Sap"] = 1,
},
+ Tools = {},
}
ITEM.Structure = {
diff --git a/gamemode/npcsystem/npcs/antlion1.lua b/gamemode/npcsystem/npcs/antlion1.lua index 2c3d908..3e90e19 100644 --- a/gamemode/npcsystem/npcs/antlion1.lua +++ b/gamemode/npcsystem/npcs/antlion1.lua @@ -36,6 +36,12 @@ NPC.IdleSequences = { --Attacks should be formated as [i]={function (return int dammage) canattack(ply) = function doattack(ply)} --NPC will do the most dammage possible per attack local checkmele = function(self, ply) + if not self then + print("In antlion1, checkmele called with null self") + end + if not ply then + print("In antlion1, checkmele called with null ply") + end if(ply:GetPos():Distance(self:GetPos()) < 100) then return 20 end return -1 end diff --git a/gamemode/npcsystem/npcs/antlion2.lua b/gamemode/npcsystem/npcs/antlion2.lua index 5b53b8e..28154cc 100644 --- a/gamemode/npcsystem/npcs/antlion2.lua +++ b/gamemode/npcsystem/npcs/antlion2.lua @@ -36,6 +36,12 @@ NPC.IdleSequences = { --Attacks should be formated as [i]={function (return int dammage) canattack(ply) = function doattack(ply)} --NPC will do the most dammage possible per attack local checkmele = function(self, ply) + if not self then + print("In antlion2, checkmele called with null self") + end + if not ply then + print("In antlion2, checkmele called with null ply") + end if(ply:GetPos():Distance(self:GetPos()) < 100) then return 20 end return -1 end diff --git a/gamemode/npcsystem/npcs/zombie.lua b/gamemode/npcsystem/npcs/zombie.lua index 41dad0f..e62b833 100644 --- a/gamemode/npcsystem/npcs/zombie.lua +++ b/gamemode/npcsystem/npcs/zombie.lua @@ -37,6 +37,12 @@ NPC.IdleSequences = { --Attacks should be formated as [i]={function (return int dammage) canattack(ply) = function doattack(ply)}
--NPC will do the most dammage possible per attack
local checkmele = function(self, ply)
+ if not self then
+ print("In zombie, checkmele called with null self")
+ end
+ if not ply then
+ print("In zombie, checkmele called with null ply")
+ end
if(ply:GetPos():Distance(self:GetPos()) < 100) then return 20 end
return -1
end
|