Bear tiles

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

game/engines/default/engine/interface/ActorTemporaryEffects.lua

@@ -150,3 +150,15 @@ function _M:removeEffect(eff, silent)
 	end
 	if _M.tempeffect_def[eff].deactivate then _M.tempeffect_def[eff].deactivate(self, p) end
 end
+
+--- Removes the effect
+function _M:removeAllEffects()
+	local todel = {}
+	for eff, p in pairs(self.tmp) do
+		todel[#todel+1] = eff
+	end
+
+	while #todel > 0 do
+		self:removeEffect(table.remove(todel))
+	end
+end

game/modules/tome/data/chats/mage-apprentice-quest.lua

@@ -73,7 +73,7 @@ In any case, I must collect 10 magic staves, rings or amulets, and I have yet to
 }
 newChat{ id="quest3_mage",
 	text = [[I hope I will too ...
-In any case, I must collect 15 magic staves, rings or amulets and I have yet to find one. I would be grateful if you could bring me some should you find any!]],
+In any case, I must collect 10 magic staves, rings or amulets and I have yet to find one. I would be grateful if you could bring me some should you find any!]],
 	answers = {
 		{"I will keep that in mind!", action=function(npc, player) player:grantQuest("mage-apprentice") end},
 		{"No way, bye!"},

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

@@ -46,7 +46,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "brown bear", color=colors.UMBER,
+	name = "brown bear", color=colors.UMBER, image = "npc/brown_bear.png",
 	desc = [[The weakest of bears, covered in brown shaggy fur.]],
 	level_range = {5, nil}, exp_worth = 1,
 	rarity = 1,
@@ -56,7 +56,7 @@ newEntity{ base = "BASE_NPC_BEAR",
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "black bear", color={50,50,50},
+	name = "black bear", color={50,50,50}, image = "npc/black_bear.png",
 	desc = [[Do you smell like honey? 'Cause this bear wants honey.]],
 	level_range = {6, nil}, exp_worth = 1,
 	rarity = 2,
@@ -66,7 +66,7 @@ newEntity{ base = "BASE_NPC_BEAR",
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "cave bear", color=colors.DARK_SLATE_GRAY,
+	name = "cave bear", color=colors.DARK_SLATE_GRAY, image = "npc/cave_bear.png",
 	desc = [[It has come down from its cave foraging for food. Unfortunately, it found you.]],
 	level_range = {7, nil}, exp_worth = 1,
 	rarity = 3,
@@ -77,7 +77,7 @@ newEntity{ base = "BASE_NPC_BEAR",
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "war bear", color=colors.DARK_UMBER,
+	name = "war bear", color=colors.DARK_UMBER, image = "npc/war_bear.png",
 	desc = [[Bears with tusks, trained to kill.]],
 	level_range = {7, nil}, exp_worth = 1,
 	rarity = 3,
@@ -88,7 +88,7 @@ newEntity{ base = "BASE_NPC_BEAR",
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "grizzly bear", color=colors.LIGHT_UMBER,
+	name = "grizzly bear", color=colors.LIGHT_UMBER, image = "npc/grizzly_bear.png",
 	desc = [[A huge, beastly bear, more savage than most of its kind.]],
 	level_range = {10, nil}, exp_worth = 1,
 	rarity = 4,
@@ -99,7 +99,7 @@ newEntity{ base = "BASE_NPC_BEAR",
 }
 
 newEntity{ base = "BASE_NPC_BEAR",
-	name = "polar bear", color=colors.WHITE,
+	name = "polar bear", color=colors.WHITE, image = "npc/polar_bear.png",
 	desc = [[This huge white bear has wandered south in search of food.]],
 	level_range = {12, nil}, exp_worth = 1,
 	rarity = 6,

game/modules/tome/data/talents/spells/golemancy.lua

@@ -198,6 +198,8 @@ newTalent{
 				return
 			end
 			game.zone:addEntity(game.level, self.alchemy_golem, "actor", x, y)
+			self.alchemy_golem:setTarget(nil)
+			self.alchemy_golem:removeAllEffects()
 		end
 
 		game:playSoundNear(self, "talents/arcane")