diff --git a/game/engines/default/engine/interface/ActorTemporaryEffects.lua b/game/engines/default/engine/interface/ActorTemporaryEffects.lua
index 7c3d492ee73dcf7cdfe7702d27f419360ce27c27..fe9eaa0b3225f66b3d3553af63b7ea54ad0dcc2d 100644
--- a/game/engines/default/engine/interface/ActorTemporaryEffects.lua
+++ b/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
diff --git a/game/modules/tome/data/chats/mage-apprentice-quest.lua b/game/modules/tome/data/chats/mage-apprentice-quest.lua
index b9d76665406afcf703fb2dcdd262534f56855849..87dcbb295ae6892cd4c3e873cb81cfb218c93602 100644
--- a/game/modules/tome/data/chats/mage-apprentice-quest.lua
+++ b/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!"},
diff --git a/game/modules/tome/data/general/npcs/bear.lua b/game/modules/tome/data/general/npcs/bear.lua
index a870a84c1cf27225a836eb29a1d9c8e83f09a902..055b1b2a0a85469d7344f0026ce1e7b26fa5ffcc 100644
--- a/game/modules/tome/data/general/npcs/bear.lua
+++ b/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,
diff --git a/game/modules/tome/data/gfx/npc/black_bear.png b/game/modules/tome/data/gfx/npc/black_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb13b2bd1397d1067deb01ee811b5050d6575e5c
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/black_bear.png differ
diff --git a/game/modules/tome/data/gfx/npc/brown_bear.png b/game/modules/tome/data/gfx/npc/brown_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..58aedb3165c1f7bb3944ca26b27cac711f6478cb
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/brown_bear.png differ
diff --git a/game/modules/tome/data/gfx/npc/cave_bear.png b/game/modules/tome/data/gfx/npc/cave_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..af352e6992461fc82f703e6100a57b5ed532606a
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/cave_bear.png differ
diff --git a/game/modules/tome/data/gfx/npc/grizzly_bear.png b/game/modules/tome/data/gfx/npc/grizzly_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..d146229aedefea94132f811b009dcac26050502d
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/grizzly_bear.png differ
diff --git a/game/modules/tome/data/gfx/npc/polar_bear.png b/game/modules/tome/data/gfx/npc/polar_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..82f260442f1bd6e003c6dd2173d1e4181502fb12
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/polar_bear.png differ
diff --git a/game/modules/tome/data/gfx/npc/war_bear.png b/game/modules/tome/data/gfx/npc/war_bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..132db55a50d7f1c84a24cd3cf0bde6e2118443fc
Binary files /dev/null and b/game/modules/tome/data/gfx/npc/war_bear.png differ
diff --git a/game/modules/tome/data/talents/spells/golemancy.lua b/game/modules/tome/data/talents/spells/golemancy.lua
index a4bd1e8ae3cfaa9169768bfdfbd9de36bf968ccc..d890982609a8c29bb510f0b342854798d3725da7 100644
--- a/game/modules/tome/data/talents/spells/golemancy.lua
+++ b/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")