Fixed Archmages starting in Angolwen who used custom tiles, they now correctly...

Fixed Archmages starting in Angolwen who used custom tiles, they now correctly get the orb of scrying


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

game/engines/default/engine/Birther.lua

@@ -313,6 +313,7 @@ function _M:apply()
 			-- Append array part
 			while #copy > 0 do
 				local f = table.remove(copy)
+				print("===============+COPY", #copy, table.serialize(f,nil,true))
 				table.insert(self.actor, f)
 			end
 			-- Copy normal data

game/engines/default/engine/Entity.lua

@@ -430,7 +430,19 @@ end
 function _M:resolve(t, last, on_entity, key_chain)
 	t = t or self
 	key_chain = key_chain or {}
+
+	-- First we grab the whole list to handle
+	local list = {}
 	for k, e in pairs(t) do
+		if type(e) == "table" and e.__resolver and (not e.__resolve_last or last) then
+			list[k] = e
+		elseif type(e) == "table" and not e.__CLASSNAME then
+			list[k] = e
+		end
+	end
+
+	-- Then we handle it, this is because resolvers can modify the list with their returns, or handlers, so we must make sure to not modify the list we are iterating over
+	for k, e in pairs(list) do
 		if type(e) == "table" and e.__resolver and (not e.__resolve_last or last) then
 			t[k] = resolvers.calc[e.__resolver](e, on_entity or self, self, t, k, key_chain)
 		elseif type(e) == "table" and not e.__CLASSNAME then
@@ -456,6 +468,15 @@ function _M:resolve(t, last, on_entity, key_chain)
 	end
 end
 
+--- Print all resolvers registered
+function _M:printResolvers(t)
+	for k, e in pairs(t or self) do
+		if type(e) == "table" and e.__resolver then
+			print(" * Resolver on entity", self.name, "::", e.__resolver, e.__resolve_last, " (with params) ", table.serialize(e, nil, true))
+		end
+	end
+end
+
 --- Call when the entity is actually added to a level/whatever
 -- This helps ensuring uniqueness of uniques
 function _M:added()

game/modules/tome/data/birth/classes/mage.lua

@@ -49,7 +49,7 @@ newBirthDescriptor{
 		"An Archmage devotes his whole life to the study of magic above anything else.",
 		"Most Archmagi lack basic skills that others take for granted (like general fighting sense), but they make up for it by their raw magical power.",
 		"Archmagi start with knowledge of many schools of magic. However, they usually refuse to have anything to do with Necromancy.",
-		"All Archmagi have been trained in the secret town of Angolwen and possess a unique spell to teleport to it directly.",
+		"Most Archmagi have been trained in the secret town of Angolwen and possess a unique spell to teleport to it directly.",
 		"Their most important stats are: Magic and Willpower",
 		"#GOLD#Stat modifiers:",
 		"#LIGHT_BLUE# * +0 Strength, +0 Dexterity, +0 Constitution",

game/modules/tome/dialogs/Birther.lua

@@ -185,7 +185,7 @@ function _M:atEnd(v)
 			game:unregisterDialog(self)
 			self.actor = self.actor_base
 			if self.has_custom_tile then
-				self:setTile(self.has_custom_tile.f, self.has_custom_tile.w, self.has_custom_tile.h)
+				self:setTile(self.has_custom_tile.f, self.has_custom_tile.w, self.has_custom_tile.h, true)
 				self.actor.has_custom_tile = self.has_custom_tile.f
 			end
 			self:apply()
@@ -838,7 +838,7 @@ function _M:fakeEquip(v)
 	end
 end
 
-function _M:setTile(f, w, h)
+function _M:setTile(f, w, h, last)
 	self.actor:removeAllMOs()
 	if not f then
 		if not self.has_custom_tile then
@@ -864,17 +864,19 @@ function _M:setTile(f, w, h)
 		end
 		self.has_custom_tile = {f=f,w=w,h=h}
 	end
-	self:fakeEquip(true)
-	self.actor:updateModdableTile()
-	self:fakeEquip(false)
-
-	-- Add an example particles if any
-	local ps = self.actor:getParticlesList()
-	for i, p in ipairs(ps) do self.actor:removeParticles(p) end
-	if self.descriptors_by_type.subclass then
-		local d = self.birth_descriptor_def.subclass[self.descriptors_by_type.subclass]
-		if d and d.birth_example_particles then
-			self.actor:addParticles(Particles.new(d.birth_example_particles, 1))
+	if not last then
+		self:fakeEquip(true)
+		self.actor:updateModdableTile()
+		self:fakeEquip(false)
+
+		-- Add an example particles if any
+		local ps = self.actor:getParticlesList()
+		for i, p in ipairs(ps) do self.actor:removeParticles(p) end
+		if self.descriptors_by_type.subclass then
+			local d = self.birth_descriptor_def.subclass[self.descriptors_by_type.subclass]
+			if d and d.birth_example_particles then
+				self.actor:addParticles(Particles.new(d.birth_example_particles, 1))
+			end
 		end
 	end
 end