Commit 47b220df777a6a380b4b21b58b77e46fc1e8817f

Authored by DarkGod
2 parents f83e55c8 09083cd6

Merge branch 'thalore_buff' into 'master'

Thalore racial 1 buffs/tweaks

<br>
- Thalore regen duration down from 10 to 8 with scaling slightly increased to match old value. This means the regen is stronger each turn and over a shorter duration. Still long enough to keep the long duration, sustain thematic. Relatively small buff overall.

- Now additionally scales with higher of Wil OR Con. Some other racials already do similar things. Wil only feels a little restrictive, Con is more universally built/used, and is at least partially related to healmod/regen thematically.

- Changed the enhanced healmod buff to actually be a physical/natural with a new buff and use the racial 1 icon, it was previously magical and used BIL's icon, leftover from when it was Higher's.

- Updated some old code on the racial, thanks Bunny!

See merge request !596
... ... @@ -318,14 +318,15 @@ newTalent{
318 318 tactical = { HEAL = 2 },
319 319 on_pre_use = function(self, t) return not self:hasEffect(self.EFF_REGENERATION) end,
320 320 getHealMod = function(self, t) return self:combatTalentLimit(t, 50, 10, 30) end,
  321 + getHealing = function(self, t) return 6 + math.max(self:getWil(), self:getCon()) * 0.6 end,
321 322 action = function(self, t)
322   - self:setEffect(self.EFF_REGENERATION, 10, {power=5 + self:getWil() * 0.5})
323   - self:setEffect(self.EFF_EMPOWERED_HEALING, 10, {power=t.getHealMod(self, t) / 100})
  323 + self:setEffect(self.EFF_REGENERATION, 8, {power=t.getHealing(self, t)})
  324 + self:setEffect(self.EFF_GIFT_WOODS, 8, {power=t.getHealMod(self, t) / 100})
324 325 return true
325 326 end,
326 327 info = function(self, t)
327   - return ([[Call upon nature to regenerate your body for %d life every turn and increase healing mod by %d%% for 10 turns.
328   - The life healed will increase with your Willpower.]]):format(5 + self:getWil() * 0.5, t.getHealMod(self, t))
  328 + return ([[Call upon nature to regenerate your body for %d life every turn and increase healing mod by %d%% for 8 turns.
  329 + The life healed will increase with your Willpower or Constitution (whichever is higher).]]):format(t.getHealing(self, t), t.getHealMod(self, t))
329 330 end,
330 331 }
331 332
... ...
... ... @@ -4291,4 +4291,20 @@ newEffect{
4291 4291 self:removeEffect(self.EFF_FORGONE_VISION)
4292 4292 end
4293 4293 end,
4294   -}
\ No newline at end of file
  4294 +}
  4295 +
  4296 +newEffect{
  4297 + name = "GIFT_WOODS", image = "talents/thaloren_wrath.png",
  4298 + desc = "Gift of the Woods",
  4299 + long_desc = function(self, eff) return ("Increases the effectiveness of all healing the target receives by %d%%."):format(eff.power * 100) end,
  4300 + type = "physical",
  4301 + subtype = { nature=true },
  4302 + status = "beneficial",
  4303 + parameters = { power = 0.1 },
  4304 + activate = function(self, eff)
  4305 + eff.tmpid = self:addTemporaryValue("healing_factor", eff.power)
  4306 + end,
  4307 + deactivate = function(self, eff)
  4308 + self:removeTemporaryValue("healing_factor", eff.tmpid)
  4309 + end,
  4310 +}
... ...