From 6c27ba2e42f3e144b7ed776d136186740eb123c9 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 21 Oct 2016 22:21:12 -0400 Subject: Fixed lua error about boss files not being found --- gamemode/npcsystem/bosses/ent.lua | 3 +++ gamemode/npcsystem/bosses/treeling.lua | 3 +++ 2 files changed, 6 insertions(+) (limited to 'gamemode/npcsystem') diff --git a/gamemode/npcsystem/bosses/ent.lua b/gamemode/npcsystem/bosses/ent.lua index e69de29..45d309e 100644 --- a/gamemode/npcsystem/bosses/ent.lua +++ b/gamemode/npcsystem/bosses/ent.lua @@ -0,0 +1,3 @@ +--[[ + This file will eventually hold the "ENT" boss +]] diff --git a/gamemode/npcsystem/bosses/treeling.lua b/gamemode/npcsystem/bosses/treeling.lua index e69de29..c223fdb 100644 --- a/gamemode/npcsystem/bosses/treeling.lua +++ b/gamemode/npcsystem/bosses/treeling.lua @@ -0,0 +1,3 @@ +--[[ + This file will eventually hold the "treeling" npc, spawned by ent bosses. +]] -- cgit v1.2.3-70-g09d2 From b0169e7ca20fd9fa4ae889af8fff16d2bf638a18 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 21 Oct 2016 22:41:39 -0400 Subject: fixed NPC spawning --- gamemode/npcsystem/loadnpcs.lua | 8 ++++++-- gamemode/npcsystem/spawnbosses.lua | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'gamemode/npcsystem') diff --git a/gamemode/npcsystem/loadnpcs.lua b/gamemode/npcsystem/loadnpcs.lua index 9bf839b..85b3cd6 100644 --- a/gamemode/npcsystem/loadnpcs.lua +++ b/gamemode/npcsystem/loadnpcs.lua @@ -2,30 +2,34 @@ local Folder = GM.Folder:gsub("gamemodes/","").."/gamemode/npcsystem/npcs" local insert = table.insert function GM:LoadNPCS() - print("NPC's loaded") + print("NPC's loaded!!!") local Items = file.Find(Folder.."/*.lua","LUA") local BaseItem = {} GAMEMODE.Npcs = {} NPC = {} - + print("Printing something else!") AddCSLuaFile(Folder.."/base.lua") include(Folder.."/base.lua") BaseItem = table.Copy(NPC) + print("Items table was",Items) for k,v in pairs(Items) do + print("Found an npc's file") if (v != "base.lua") then AddCSLuaFile(Folder.."/"..v) include(Folder.."/"..v) insert(GAMEMODE.Npcs,NPC) + print("Inserting ",NPC.Name) NPC = table.Copy(BaseItem) end end + print("Finished loading npc's") end hook.Add("Initialize","Loadnpcs",function() diff --git a/gamemode/npcsystem/spawnbosses.lua b/gamemode/npcsystem/spawnbosses.lua index bcd29ac..a4a7aaa 100644 --- a/gamemode/npcsystem/spawnbosses.lua +++ b/gamemode/npcsystem/spawnbosses.lua @@ -2,12 +2,12 @@ local Folder = GM.Folder:gsub("gamemodes/","").."/gamemode/npcsystem/bosses" local insert = table.insert -function GM:LoadNPCS() - print("NPC's loaded") +function GM:LoadBosses() + print("Bosses loaded") local Items = file.Find(Folder.."/*.lua","LUA") local BaseItem = {} - GAMEMODE.Npcs = {} + GAMEMODE.Bosses = {} NPC = {} @@ -21,7 +21,7 @@ function GM:LoadNPCS() AddCSLuaFile(Folder.."/"..v) include(Folder.."/"..v) - insert(GAMEMODE.Npcs,NPC) + insert(GAMEMODE.Bosses,NPC) NPC = table.Copy(BaseItem) @@ -29,12 +29,12 @@ function GM:LoadNPCS() end end -hook.Add("Initialize","Loadnpcs",function() - GAMEMODE:LoadNPCS() +hook.Add("Initialize","Loadbosses",function() + GAMEMODE:LoadBosses() end) -function GetNpcByName(name) - for k,v in pairs( GAMEMODE.Npcs ) do +function GetBossByName(name) + for k,v in pairs( GAMEMODE.Bosses ) do if (v.Name == name) then return v end end -- cgit v1.2.3-70-g09d2