diff --git a/game/engine/interface/ActorTemporaryEffects.lua b/game/engine/interface/ActorTemporaryEffects.lua
index 3bcf8b528a39b44f54f4c48c85bfe03f97fe7e3b..5b1ad29a67cda559c2db9ada70d7e0fefa437255 100644
--- a/game/engine/interface/ActorTemporaryEffects.lua
+++ b/game/engine/interface/ActorTemporaryEffects.lua
@@ -59,10 +59,14 @@ end
-- @param eff_id the effect to set
-- @param dur the number of turns to go on
-- @param p a table containing the effects parameters
-function _M:setEffect(eff_id, dur, p)
+-- @parm silent true to suppress messages
+function _M:setEffect(eff_id, dur, p, silent)
-- Beware, setting to 0 means removing
if dur <= 0 then return self:removeEffect(eff_id) end
+ -- If we already have it, we remove it and re-add it
+ if self:hasEffect(eff_id) then self:removeEffect(eff_id, true) end
+
for k, e in pairs(_M.tempeffect_def[eff_id].parameters) do
if not p[k] then p[k] = e end
end
@@ -70,12 +74,14 @@ function _M:setEffect(eff_id, dur, p)
self.tmp[eff_id] = p
if _M.tempeffect_def[eff_id].on_gain then
local ret, fly = _M.tempeffect_def[eff_id].on_gain(self, p)
- if ret then
- game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
- end
- if fly and game.flyers then
- local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
- game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
+ if not silent then
+ if ret then
+ game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
+ end
+ if fly and game.flyers then
+ local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
+ game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
+ end
end
if _M.tempeffect_def[eff_id].activate then _M.tempeffect_def[eff_id].activate(self, p) end
self.changed = true
@@ -90,18 +96,20 @@ function _M:hasEffect(eff_id)
end
--- Removes the effect
-function _M:removeEffect(eff)
+function _M:removeEffect(eff, silent)
local p = self.tmp[eff]
self.tmp[eff] = nil
self.changed = true
if _M.tempeffect_def[eff].on_lose then
local ret, fly = _M.tempeffect_def[eff].on_lose(self, p)
- if ret then
- game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
- end
- if fly and game.flyers then
- local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
- game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
+ if not silent then
+ if ret then
+ game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
+ end
+ if fly and game.flyers then
+ local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
+ game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
+ end
end
end
if _M.tempeffect_def[eff].deactivate then _M.tempeffect_def[eff].deactivate(self, p) end
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 664cdcd567ef0a48d142ad9c5393c7e7ea1ac4f5..f20702fad50d3c72db017fc80be7830c8653b381 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -281,6 +281,15 @@ function _M:postUseTalent(ab, ret)
return true
end
+--- How much experience is this actor worth
+-- @return the experience rewarded
+function _M:worthExp()
+ local mult = 2
+ if self.unique then mult = 6
+ elseif self.egoed then mult = 3 end
+ return self.level * mult * self.exp_worth
+end
+
--- Can the actor see the target actor
-- This does not check LOS or such, only the actual ability to see it.<br/>
-- Check for telepathy, invisibility, stealth, ...
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index eb6b1800e4279b77ee912f167e3ca16a50be329a..99401a267402b9c69d8eb9c14598615c0ce05194 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -105,7 +105,7 @@ end
function _M:getSaveDescription()
return {
name = self.player.name,
- description = [[Strolling in the old places of the world!]],
+ description = ([[Exploring level %d of %s.]]):format(self.level.level, self.zone.name),
}
end
diff --git a/game/modules/tome/class/TalentsDisplay.lua b/game/modules/tome/class/TalentsDisplay.lua
index dbeaa5212ee32b1e61e7019a4133de24de7fa23b..73f859bc8dbd73d5b516a4ce8748b9536bb35975 100644
--- a/game/modules/tome/class/TalentsDisplay.lua
+++ b/game/modules/tome/class/TalentsDisplay.lua
@@ -8,7 +8,7 @@ function _M:init(x, y, w, h, bgcolor)
self.w, self.h = w, h
self.surface = core.display.newSurface(w, h)
self.bgcolor = bgcolor
- self.font = core.display.newFont("/data/font/VeraMono.ttf", 8)
+ self.font = core.display.newFont("/data/font/VeraMono.ttf", 12)
self.font_h = self.font:lineSkip()
end
@@ -29,12 +29,14 @@ function _M:display()
self.surface:erase(self.bgcolor[1], self.bgcolor[2], self.bgcolor[3])
local acode = string.byte('1')
+ local x = 0
+ local y = 0
for i, tid in ipairs(talents) do
local t = a:getTalentFromId(tid)
local s
if a:isTalentCoolingDown(t) then
- local txt = ("%s) %s (%d)"):format(string.char(acode + i - 1), t.name, a:isTalentCoolingDown(t))
+ local txt = ("%d) %s (%d)"):format(i, t.name, a:isTalentCoolingDown(t))
local w, h = self.font:size(txt)
s = core.display.newSurface(w + 4, h + 4)
s:erase(40, 40, 40)
@@ -42,7 +44,7 @@ function _M:display()
s:alpha(128)
s:drawString(self.font, txt, 2, 2, 255, 0, 0)
elseif a:isTalentActive(t.id) then
- local txt = ("%s) %s"):format(string.char(acode + i - 1), t.name)
+ local txt = ("%d) %s"):format(i, t.name)
local w, h = self.font:size(txt)
s = core.display.newSurface(w + 4, h + 4)
s:erase(40, 40, 40)
@@ -50,7 +52,7 @@ function _M:display()
s:alpha(255)
s:drawString(self.font, txt, 2, 2, 255, 255, 0)
else
- local txt = ("%s) %s"):format(string.char(acode + i - 1), t.name)
+ local txt = ("%d) %s"):format(i, t.name)
local w, h = self.font:size(txt)
s = core.display.newSurface(w + 4, h + 4)
s:erase(40, 40, 40)
@@ -59,7 +61,13 @@ function _M:display()
s:drawString(self.font, txt, 2, 2, 0, 255, 0)
end
- self.surface:merge(s, 0, (i-1) * 20)
+ self.surface:merge(s, x, y)
+ if y + self.font_h * 2 > self.h then
+ x = x + self.w / 3
+ y = 0
+ else
+ y = y + self.font_h
+ end
end
return self.surface
diff --git a/game/modules/tome/data/general/npcs/skeleton.lua b/game/modules/tome/data/general/npcs/skeleton.lua
index f7ef1cc770f6af880c80302543990cae5c43f5c2..dd4cdd6ef790a6eadb6c876626725f0f50c20bde 100644
--- a/game/modules/tome/data/general/npcs/skeleton.lua
+++ b/game/modules/tome/data/general/npcs/skeleton.lua
@@ -9,7 +9,7 @@ newEntity{
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{ {type="weapon", subtype="longsword"} },
- drops = resolvers.drops{chance=200, nb=10, {} },
+ drops = resolvers.drops{chance=20, nb=1, {} },
autolevel = "warrior",
ai = "dumb_talented_simple", ai_state = { talent_in=3, },
diff --git a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
index 9c3604236f0cc3550d88219506775de394c49867..e4a9e7987efa5ca1b4cc33450b103b860d94eaa3 100644
--- a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
+++ b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
@@ -10,17 +10,16 @@ newEntity{ define_as = "SHADE_OF_ANGMAR",
name = "The Shade of Angmar",
display = "s", color=colors.VIOLET,
desc = [[This skeleton looks nasty. There is red flames in its empty eye sockets. It wield a nasty sword and towers toward you, throwing spells.]],
- level_range = {6, 10}, exp_worth = 1,
- max_life = 150, fixed_rating = true,
+ level_range = {7, 10}, exp_worth = 2,
+ max_life = 150, life_rating = 15, fixed_rating = true,
max_mana = 85,
- combat_armor = 3, combat_def = 1,
- stats = { str=10, dex=12, cun=14, mag=14, con=10 },
+ stats = { str=15, dex=12, cun=14, mag=16, con=16 },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
- equipment = resolvers.equip{ {type="weapon", subtype="longsword"} },
- drops = resolvers.drops{chance=100, nb=5, {ego_chance=50} },
+ equipment = resolvers.equip{ {type="weapon", subtype="longsword"}, {type="armor", subtype="light"}, },
+ drops = resolvers.drops{chance=100, nb=3, {ego_chance=100} },
- talents = resolvers.talents{ Talents.T_MANA_POOL, Talents.T_FREEZE, Talents.T_TIDAL_WAVE },
+ talents = resolvers.talents{ Talents.T_MANA_POOL, Talents.T_MANATHRUST, Talents.T_FREEZE, Talents.T_TIDAL_WAVE },
autolevel = "warriormage",
ai = "dumb_talented_simple", ai_state = { talent_in=4, },
diff --git a/game/modules/tome/data/zones/tower-amon-sul/zone.lua b/game/modules/tome/data/zones/tower-amon-sul/zone.lua
index 7b88d6fe268db80154b757d93482cbfc4b914077..b182ee1f151435c59434effcf6cef8bd1752fd93 100644
--- a/game/modules/tome/data/zones/tower-amon-sul/zone.lua
+++ b/game/modules/tome/data/zones/tower-amon-sul/zone.lua
@@ -27,7 +27,7 @@ return {
},
object = {
class = "engine.generator.object.Random",
- nb_object = {200, 300},
+ nb_object = {2, 5},
ood = {chance=5, range={1, 10}},
},
},