diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 88e9828c6e77aebaccc86c48730c364f773b4f80..2e24fc332476fa2dfcdb9f658e10a311018ba157 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -2802,8 +2802,20 @@ function _M:updateModdableTile()
local add = self.add_mos
local i
+ self:triggerHook{"Actor:updateModdableTile:back", base=base, add=add}
+
i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile):format("behind")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
add[#add+1] = {image = base..(self.moddable_tile_base or "base_01.png")}
+
+ if not self:attr("disarmed") then
+ i = self.inven[self.INVEN_MAINHAND]; if i and i[1] and i[1].moddable_tile_back then
+ add[#add+1] = {image = base..(i[1].moddable_tile_back):format("right")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1}
+ end
+ i = self.inven[self.INVEN_OFFHAND]; if i and i[1] and i[1].moddable_tile_back then
+ add[#add+1] = {image = base..(i[1].moddable_tile_back):format("left")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1}
+ end
+ end
+
i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile):format("shoulder")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
i = self.inven[self.INVEN_FEET]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile2 then add[#add+1] = {image = base..(i[1].moddable_tile2)..".png"}
@@ -2828,6 +2840,8 @@ function _M:updateModdableTile()
end
end
+ self:triggerHook{"Actor:updateModdableTile:front", base=base, add=add}
+
if self.moddable_tile_ornament and self.moddable_tile_ornament[self.female and "female" or "male"] then add[#add+1] = {image = base..self.moddable_tile_ornament[self.female and "female" or "male"]..".png"} end
if self.x and game.level then game.level.map:updateMap(self.x, self.y) end
diff --git a/game/modules/tome/data/chats/slasul.lua b/game/modules/tome/data/chats/slasul.lua
index 0f11ca31b69da9f77308e2ed081f31a9a496c038..a02962f70fd59bac1057b803f3af3ee4dac6237d 100644
--- a/game/modules/tome/data/chats/slasul.lua
+++ b/game/modules/tome/data/chats/slasul.lua
@@ -97,7 +97,7 @@ In return let me offer you this powerful trident.]],
game.level.map:particleEmitter(npc.x, npc.y, 1, "demon_teleport")
game.level.map:particleEmitter(player.x, player.y, 1, "demon_teleport")
npc.invulnerable = 1
- npc.never_angry = 1
+ npc.never_anger = 1
player:setQuestStatus("temple-of-creation", engine.Quest.COMPLETED, "legacy-naloren")
end
end},
diff --git a/game/modules/tome/data/quests/anti-antimagic.lua b/game/modules/tome/data/quests/anti-antimagic.lua
index b87ff10269efab7191f54f618842154fdb9afed6..a21a013bf170689d1e1c9c8e189a6ebb1feca356 100644
--- a/game/modules/tome/data/quests/anti-antimagic.lua
+++ b/game/modules/tome/data/quests/anti-antimagic.lua
@@ -126,7 +126,7 @@ myssil_dies = function(self)
if not corr then return end
corr:doEmote("Victory is mine!", 60)
- corr.never_angry = nil
+ corr.never_anger = nil
game.player:setQuestStatus(self.id, self.COMPLETED)
end
diff --git a/game/modules/tome/data/talents/corruptions/vim.lua b/game/modules/tome/data/talents/corruptions/vim.lua
index 092bbe7505dc358c574b8a263bb1e1a6019a9c51..d1081a718806c87afd801628ea356767b45605d5 100644
--- a/game/modules/tome/data/talents/corruptions/vim.lua
+++ b/game/modules/tome/data/talents/corruptions/vim.lua
@@ -61,11 +61,12 @@ newTalent{
self:setEffect(self.EFF_SENSE, t.getDuration(self,t), {
range = rad,
actor = 1,
+ VimsensePenalty = t.getResistPenalty(self,t), -- Compute resist penalty at time of activation
on_detect = function(self, x, y)
local a = game.level.map(x, y, engine.Map.ACTOR)
if not a or self:reactionToward(a) >= 0 then return end
a:setTarget(game.player)
- a:setEffect(a.EFF_VIMSENSE, 2, {power=t.getResistPenalty(self,t)})
+ a:setEffect(a.EFF_VIMSENSE, 2, {power=self:hasEffect(self.EFF_SENSE).VimsensePenalty or 0})
end,
})
game:playSoundNear(self, "talents/spell_generic")
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index 0b364e015705218654226b09c32bf8c4f7c8f4bc..ec16c97a2df4c16113d8fa3d5932a84e5cac5cea 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -195,7 +195,7 @@ newTalent{
if target.level - 2 > self.level then
-- level bonus
- hateGain = hateGain + (target.level - 2 - self.level) * 2
+ hateGain = hateGain + math.ceil(self:combatTalentScale(target.level - 2 - self.level, 2, 10, "log", 0, 1))
hateMessage = "#F53CBE#You have taken the life of an experienced foe!"
end
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 0c10a3d2c657c31f7a9f18fac1bc73298f8fdaab..bddd963a71d2f3a0905a262a4d0bcc22b3b8a405 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -925,7 +925,7 @@ newTalent{
equilibrium = 4,
cooldown = 6,
range = 0,
- radius = function(self, t) return math.floor(self:combatTalentScale(t, 2.7, 5,3)) end,
+ radius = function(self, t) return math.floor(self:combatTalentScale(t, 2.7, 5.3)) end,
direct_hit = true,
tactical = { DISABLE = 3 },
requires_target = true,
diff --git a/game/modules/tome/data/talents/misc/objects.lua b/game/modules/tome/data/talents/misc/objects.lua
index 71e876962dfaa30b44f7364ec6e6879cad5c8951..4a7c91d88c321ffe7da18d9c7a0d21fef2e57400 100644
--- a/game/modules/tome/data/talents/misc/objects.lua
+++ b/game/modules/tome/data/talents/misc/objects.lua
@@ -362,22 +362,22 @@ newTalent{
cooldown = 15,
no_energy = true,
activate = function(self, t)
- t.trance_counter = 0
local ret = {}
self:talentTemporaryValue(ret, "resists", {all=15})
self:talentTemporaryValue(ret, "combat_mindpower", -15)
self:talentTemporaryValue(ret, "combat_mentalresist", 20)
+ ret.trance_counter = 0
return ret
end,
deactivate = function(self, t, p)
- t.trance_counter = nil
return true
end,
callbackOnAct = function(self, t)
- t.trance_counter = t.trance_counter + 1
- if t.trance_counter <= 6 then return end
-
- if rng.percent((t.trance_counter - 5) * 2) then
+ local tt = self:isTalentActive(t.id)
+ if not tt then return end
+ tt.trance_counter = tt.trance_counter + 1
+ if tt.trance_counter <= 5 then return end
+ if rng.percent((tt.trance_counter - 5) * 2) then
self:forceUseTalent(self.T_BATTLE_TRANCE, {ignore_energy=true})
self:setEffect(self.EFF_CONFUSED, 4, {power=40})
game.logPlayer(self, "You overdose on the honeyroot sap!")
diff --git a/game/modules/tome/data/talents/psionic/focus.lua b/game/modules/tome/data/talents/psionic/focus.lua
index 2ef66e7f71c10b405c3a598113663989e82f3981..e5916d75c4d4203043c4989d858a644a612e8bfe 100644
--- a/game/modules/tome/data/talents/psionic/focus.lua
+++ b/game/modules/tome/data/talents/psionic/focus.lua
@@ -49,9 +49,8 @@ newTalent{
if auras.c_aura_on then
val.LIGHTNING = 1
end
- return val
end
- return 0
+ return val
end },
range = function(self, t)
local r = 5
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index dc58dd0526a5338c7291f9fd76374f2a3db68471..66a3fe35d600b831f00c3c2c47e72a84195500e8 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -1493,6 +1493,15 @@ newEffect{
self.tempeffect_def[self.EFF_CURSED_FORM].updateEffect(self, eff)
end
end
+ if (eff.statChange or 0)>0 and eff.neutralizeChance then -- Remove poisons/disease (w/Grim Resolve)
+ local efdef
+ for efid, ef in pairs(self.tmp) do
+ efdef = self.tempeffect_def[efid]
+ if efdef.subtype and (efdef.subtype.poison or efdef.subtype.disease) and rng.percent(eff.neutralizeChance) then
+ self:removeEffect(efid)
+ end
+ end
+ end
end,
}
diff --git a/game/modules/tome/data/zones/town-zigur/npcs.lua b/game/modules/tome/data/zones/town-zigur/npcs.lua
index efae58d15e730240810cebd4ff8788422883ba30..4c0761ebcef21ad73c3dbd7baee90ad8c5de34e3 100644
--- a/game/modules/tome/data/zones/town-zigur/npcs.lua
+++ b/game/modules/tome/data/zones/town-zigur/npcs.lua
@@ -31,7 +31,7 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
level_range = {30, nil}, exp_worth = 1,
rank = 3.5,
max_vim = 800,
- never_angry = 1,
+ never_anger = 1,
max_life = resolvers.rngavg(300, 310), life_rating = 18,
resolvers.equip{
{type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true},
diff --git a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
index 7ba88b26c1aa31def501fe4d58d5e750598c47aa..1c38af7a89574525932d4c4cd86713b82fb87977 100644
--- a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
+++ b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
@@ -45,7 +45,7 @@ newEntity{ define_as = "FILLAREL",
instakill_immune = 1,
teleport_immune = 1,
move_others=true,
- never_angry=true,
+ never_anger=true,
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
equipment = resolvers.equip{
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index 1066fd69f28f430021b5290268340099d7181881..f848da9e9a600ecb39bbfcd8a4184da8f06125d5 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -564,12 +564,17 @@ function _M:drawDialog(kind, actor_to_compare)
for i, o in ipairs(player:getInven(player.INVEN_MAINHAND)) do
local mean, dam = player:getObjectCombat(o, "mainhand"), player:getObjectCombat(o, "mainhand")
+ local range
if o.archery and mean then
- dam = (player:getInven("QUIVER") and player:getInven("QUIVER")[1] and player:getInven("QUIVER")[1].combat)
+ local ammo = player:getInven("QUIVER") and player:getInven("QUIVER")[1]
+ if ammo and ammo.archery_ammo == o.archery then -- make sure ammo matches launcher
+ dam = player:getObjectCombat(ammo, "mainhand")
+ range = mean.range
+ end
end
if mean and dam then
s:drawColorStringBlended(self.font, WeaponTxt, w, h, 255, 255, 255, true) h = h + self.font_h
- text = compare_fields(player, actor_to_compare, function(actor, ...) return math.floor(actor:combatAttack(...)) end, "%3d", "%+.0f", 1, false, false, mean)
+ text = compare_fields(player, actor_to_compare, function(actor, ...) return math.floor(actor:combatAttack(...)) end, "%3d", "%+.0f", 1, false, false, mean, dam)
dur_text = ("%d"):format(math.floor(player:combatAttack(o.combat)/5))
self:mouseTooltip(self.TOOLTIP_COMBAT_ATTACK, s:drawColorStringBlended(self.font, ("Accuracy : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
text = compare_fields(player, actor_to_compare, function(actor, ...) return actor:combatDamage(...) end, "%3d", "%+.0f", 1, false, false, dam)
@@ -581,8 +586,8 @@ function _M:drawDialog(kind, actor_to_compare)
text = compare_fields(player, actor_to_compare, function(actor, ...) return actor:combatSpeed(...) end, "%.2f%%", "%+.2f%%", 100, true, false, mean)
self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED, s:drawColorStringBlended(self.font, ("Speed : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
end
- if mean and mean.range then
- self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255, true)) h = h + self.font_h
+ if range then
+ self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(range), w, h, 255, 255, 255, true)) h = h + self.font_h
end
end
-- Handle bare-handed combat