fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@1798 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Entity.lua

@@ -433,7 +433,7 @@ function _M:loadList(file, no_default, res, mod, loaded)
 			self:loadList(f, no_default, res, new_mod or mod, loaded)
 		end,
 		loadList = function(f, new_mod)
-			return self:loadList(f, no_default, nil, new_mod or mod, loaded)
+			return self:loadList(f, no_default, nil, new_mod or mod, nil)
 		end,
 	}
 	setfenv(f, setmetatable(newenv, {__index=_G}))

game/modules/tome/data/general/npcs/all.lua

@@ -46,6 +46,7 @@ loadIfNot("/data/general/npcs/multihued-drake.lua")
 loadIfNot("/data/general/npcs/naga.lua")
 loadIfNot("/data/general/npcs/ooze.lua")
 loadIfNot("/data/general/npcs/orc-grushnak.lua")
+loadIfNot("/data/general/npcs/orc-gorbat.lua")
 loadIfNot("/data/general/npcs/orc.lua")
 loadIfNot("/data/general/npcs/orc-rak-shor.lua")
 loadIfNot("/data/general/npcs/orc-vor.lua")

game/modules/tome/data/zones/infinite-dungeon/npcs.lua

@@ -17,9 +17,6 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
--- Do not use shades
-load("/data/general/npcs/shade.lua", function(e) e.rarity = nil end)
-
 -- Load all others
 load("/data/general/npcs/all.lua")
 load("/data/general/npcs/bone-giant.lua")
@@ -30,20 +27,20 @@ load("/data/general/npcs/ritch.lua")
 
 -- Load the bosses of all other zones
 local function loadOuter(file)
-	local oldload, oldloadif
-	oldload, load = load, function() end
-	oldloadif, loadIfNot = load, function() end
-	oldload(file, function(e)
+	local list = loadList(file, function(e)
 		if e.allow_infinite_dungeon and not e.rarity then
 			e.rarity = 25
 			e.on_die = nil
 			e.can_talk = nil
 			e.on_acquire_target = nil
-			print("========================= FOUND boss", e.name)
 		end
 	end)
-	load = oldload
-	loadIfNot = oldloadif
+	for i, e in ipairs(list) do
+		if e.allow_infinite_dungeon then
+			importEntity(e)
+			print("========================= Importing boss", e.name)
+		end
+	end
 end
 
 for i, zone in ipairs(fs.list("/data/zones/")) do