From f4460af8cc623e08d9e8d35f15847dd5fa659b4b Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Fri, 8 Jan 2016 14:04:39 +0100
Subject: [PATCH] Deflection now regens on rest, displays its current value on
the icon, absorbs more damage and regens faster
---
.../data/chats/shertul-fortress-butler.lua | 2 +-
.../data/talents/cursed/force-of-will.lua | 21 +++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/game/modules/tome/data/chats/shertul-fortress-butler.lua b/game/modules/tome/data/chats/shertul-fortress-butler.lua
index b95e87448a..71ecf21d7f 100644
--- a/game/modules/tome/data/chats/shertul-fortress-butler.lua
+++ b/game/modules/tome/data/chats/shertul-fortress-butler.lua
@@ -124,7 +124,7 @@ Done.]],
newChat{ id="farportal",
text = [[Long ago the Sher'tuls used farportals not only for transportation to known locations, but also to explore new parts of the world, or even other worlds.
-This Fortress is equipped with an exploratory farportal, and now has enough energy to allow one teleportation. Each teleportation will take you to a random part of the universe and use 30 energy.
+This Fortress is equipped with an exploratory farportal, and now has enough energy to allow one teleportation. Each teleportation will take you to a random part of the universe and use 45 energy.
Beware that the return portal may not be nearby your arrival point; you will need to find it. You can use the rod of recall to try to force an emergency recall, but it has high chances of breaking the exploratory farportal forever.
You may use the farportal; however, beware - I sense a strange presence in the farportal room.]],
answers = {
diff --git a/game/modules/tome/data/talents/cursed/force-of-will.lua b/game/modules/tome/data/talents/cursed/force-of-will.lua
index d31ea3aa58..c974c8ea57 100644
--- a/game/modules/tome/data/talents/cursed/force-of-will.lua
+++ b/game/modules/tome/data/talents/cursed/force-of-will.lua
@@ -156,12 +156,20 @@ newTalent{
tactical = { DEFEND = 2 },
no_sustain_autoreset = true,
getMaxDamage = function(self, t)
- return self:combatTalentMindDamage(t, 0, 240)
+ return self:combatTalentMindDamage(t, 0, 400)
end,
getDisplayName = function(self, t, p)
return ("Deflection (%d)"):format(p.value)
end,
+ iconOverlay = function(self, t, p)
+ local val = p.value or 0
+ if val <= 0 then return "" end
+ local fnt = "buff_font_small"
+ if val >= 1000 then fnt = "buff_font_smaller" end
+ return tostring(math.ceil(val)), fnt
+ end,
critpower = function(self, t) return self:combatTalentScale(t, 4, 15) end,
+ getRechargeRate = function(self, t) return self:combatTalentLimit(t, 5, 35, 10) end,
activate = function(self, t)
game:playSoundNear(self, "talents/spell_generic2")
return {
@@ -174,13 +182,17 @@ newTalent{
p.particles = nil
return true
end,
+ callbackOnRest = function(self, t)
+ local p = self.sustain_talents[t.id]
+ if not p or p.value < t.getMaxDamage(self, t) then return true end
+ end,
callbackOnActBase = function(self, t)
local p = self:isTalentActive(t.id)
local maxDamage = t.getMaxDamage(self, t)
if p.value < maxDamage and self.hate >= 0.2 then
self:incHate(-0.2)
- p.value = math.min(p.value + maxDamage / 35, maxDamage)
+ p.value = math.min(p.value + maxDamage / t.getRechargeRate(self, t), maxDamage)
p.__update_display = true
t.updateParticles(self, t, p)
@@ -214,9 +226,10 @@ newTalent{
end,
info = function(self, t)
local maxDamage = t.getMaxDamage(self, t)
- return ([[Create a barrier that siphons hate from you at the rate of 0.2 a turn. The barrier will deflect 50%% of incoming damage with the force of your will, up to %d damage. The barrier charges at a rate of 1/35th of its maximum charge per turn.
+ local recharge_rate = t.getRechargeRate(self, t)
+ return ([[Create a barrier that siphons hate from you at the rate of 0.2 a turn. The barrier will deflect 50%% of incoming damage with the force of your will, up to %d damage. The barrier charges at a rate of 1/%d of its maximum charge per turn.
In addition, your ability to channel force with this talent increases all critical damage by %d%% (currently: %d%%)
- The maximum damage deflected increases with your Mindpower.]]):format(maxDamage, t.critpower(self, t),self.combat_critical_power or 0)
+ The maximum damage deflected increases with your Mindpower.]]):format(maxDamage, recharge_rate, t.critpower(self, t),self.combat_critical_power or 0)
end,
}
--
GitLab