Streamlined base_list handling in game.zone:makeEntity (and...

Streamlined base_list handling in game.zone:makeEntity (and resolvers.resolveObject) to prevent excessive reloading and processing entity lists.
Priority is type (if a base_list) then filter.base_list

Actor:addedToLevel: escorts will get an appropriate faction (hard_faction, game.zone.special_level_faction, summoner.faction)

game.state:applyRandomClass: converted equipment resolvers will allow power_source.nature (for Psyshots)

The I.D. sets special_level_faction = "enemies" for NPCs created after level generation

dialogs/debug/DebugMain.lua: fixed a bug that could cause no exp to be awarded when killing NPCs

game/engines/default/engine/Zone.lua

@@ -370,7 +370,8 @@ end
 -- @param level a Level object to generate for
 -- @param type one of "object" "terrain" "actor" "trap" or a table of entities with __real_type defined
 -- @param filter a filter table with optional fields:
---		base_list: an entities list (table) or a specifier to load the entities list from a file, format: <classname>:<file path>
+--		base_list: an entities list (table) or a specifier to load the entities list from a file, format: <classname>:<file path> (takes priority over type)
+--		special_rarity: alternate field for entity rarity field (default 'rarity')
 --		nb_tries: maximum number of attempts to randomly pick the entity from the list
 -- @param force_level if not nil forces the current level for resolvers to this one
 -- @param prob_filter if true a new probability list based on this filter will be generated, ensuring to find objects better but at a slightly slower cost (maybe)
@@ -403,7 +404,7 @@ function _M:makeEntity(level, type, filter, force_level, prob_filter)
 		if tries == 0 then return nil end
 	-- Generate a specific probability list, slower to generate but no need to "try and be lucky"
 	elseif filter then
-		local base_list = nil
+		local base_list = list
 		if filter.base_list then
 			if _G.type(filter.base_list) == "table" then base_list = filter.base_list
 			else
@@ -412,12 +413,15 @@ function _M:makeEntity(level, type, filter, force_level, prob_filter)
 					base_list = require(class):loadList(file)
 				end
 			end
+			type = base_list and base_list.__real_type or type
+		elseif base_list then -- type = base_list.__real_type
 		elseif type == "actor" then base_list = self.npc_list
 		elseif type == "object" then base_list = self.object_list
 		elseif type == "trap" then base_list = self.trap_list
-		else
-			base_list = list or self:getEntities(level, type) if not base_list then return nil end 
+		elseif not base_list then 
+			base_list = self:getEntities(level, type)
 		end
+		if not base_list then return nil end
 		local list = self:computeRarities(type, base_list, level, function(e) return self:checkFilter(e, filter, type) end, filter.add_levels, filter.special_rarity)
 		e = self:pickEntity(list)
 		print("[MAKE ENTITY] prob list generation", e and e.name, "from list size", #list)

game/modules/tome/class/Actor.lua

@@ -6745,6 +6745,7 @@ function _M:addedToLevel(level, x, y)
 						if m and m:canMove(x, y) then
 							if filter.no_subescort then m.make_escort = nil end
 							if self._empty_drops_escort then m:emptyDrops() end
+							m.faction = m.hard_faction or game.zone.special_level_faction or self.faction
 							game.zone:addEntity(game.level, m, "actor", x, y)
 							if filter.post then filter.post(self, m) end
 						elseif m then m:removed() end

game/modules/tome/class/GameState.lua

@@ -2013,7 +2013,7 @@ function _M:applyRandomClass(b, data, instant)
 							d.name, d.id = nil, nil
 							d.ego_chance = nil
 							d.ignore_material_restriction = true
-							d.forbid_power_source = b.not_power_source
+							d.forbid_power_source = table.clone(b.not_power_source, nil, {nature=true})
 							d.tome_drops = data.loot_quality or "boss"
 							d.force_drop = (data.drop_equipment == nil) and true or data.drop_equipment
 						end

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

@@ -32,6 +32,7 @@ return {
 	no_worldport = true,
 	infinite_dungeon = true,
 	events_by_level = true,
+	special_level_faction = "enemies",
 	ambient_music = function() return rng.table{
 		"Battle Against Time.ogg",
 		"Breaking the siege.ogg",
@@ -330,7 +331,7 @@ return {
 		end
 		
 		-- Everything hates you in the infinite dungeon!
-		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or "enemies" end
+		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or zone.special_level_faction or "enemies" end
 		
 		-- Some lore
 		if level.level == 1 or level.level == 10 or level.level == 20 or level.level == 30 or level.level == 40 then

game/modules/tome/dialogs/debug/DebugMain.lua

@@ -124,7 +124,7 @@ function _M:use(item)
 						game.level:removeEntity(e)
 					else
 						game.log("#GREY#Killing [%s] %s at (%s, %s)", e.uid, e.name, e.x, e.y)
-						e:die(p, "By Cheating!")
+						e:die(game.player, "By Cheating!")
 					end
 					count = count + 1
 				end

game/modules/tome/resolvers.lua

@@ -50,6 +50,7 @@ local Talents = require "engine.interface.ActorTalents"
 -- Additional filter fields are interpreted by other functions that can affect equipment generation:
 -- @see engine.zone:checkFilter: type, subtype, name, define_as, unique, properties, not_properties,
 --		check_filter, special, max_ood
+-- @see engine.zone:makeEntity: special_rarity
 -- @see game.state:entityFilterAlter: force_tome_drops, no_tome_drops, tome, tome_mod
 -- @see game.state:entityFilter: ignore_material_restriction, tome_mod, forbid_power_source, power_source
 -- @see game.state:entityFilterPost: random_object
@@ -75,6 +76,7 @@ function resolvers.resolveObject(e, filter, do_wear, tries)
 					print("[resolveObject] COULD NOT LOAD base_list:", filter.base_list)
 				end
 			end
+			filter.base_list = nil
 		end
 		repeat
 			local ok = true
@@ -215,6 +217,7 @@ function resolvers.resolveObject(e, filter, do_wear, tries)
 		end
 	else
 		print("[resolveObject] **FAILED** for", e.uid, e.name, "filter:", (string.fromTable(filter, 2)))
+		game.log("[%s] %s #YELLOW_GREEN#Object resolver FAILED#LAST# \n#AQUAMARINE#filter:%s#LAST#", e.uid, e.name, string.fromTable(filter, 2)) -- debugging
 	end
 	return o
 end