things

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

game/engines/default/engine/Zone.lua

@@ -289,7 +289,14 @@ function _M:makeEntity(level, type, filter, force_level, prob_filter)
 	-- Generate a specific probability list, slower to generate but no need to "try and be lucky"
 	elseif filter then
 		local base_list = nil
-		if filter.base_list then base_list = filter.base_list
+		if filter.base_list then 
+			if _G.type(filter.base_list) == "table" then base_list = filter.base_list
+			else
+				local _, _, class, file = filter.base_list:find("(.*):(.*)")
+				if class and file then
+					base_list = require(class):loadList(file)
+				end
+			end
 		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

game/modules/tome/class/Object.lua

@@ -1285,6 +1285,7 @@ function _M:getDesc(name_param, compare_with, never_compare)
 		if self.power_source.technique then desc:add("Crafted by ", {"color", "LIGHT_UMBER"}, "a master", {"color", "LAST"}, true) end
 		if self.power_source.psionic then desc:add("Infused by ", {"color", "YELLOW"}, "psionic forces", {"color", "LAST"}, true) end
 		if self.power_source.unknown then desc:add("Powered by ", {"color", "CRIMSON"}, "unknown forces", {"color", "LAST"}, true) end
+		self:triggerHook{"Object:descPowerSource", desc=desc, object=self}
 	end
 
 	if self.encumber then