Commit 2a6a8fcaf2b1429dff34c9c13965c8c9700d8031

Authored by DarkGod
1 parent 851b895a

Dwarf Stoneskin fully ignores the triggering attack, and correctly states it has…

… no cooldown and can re-proc while active
... ... @@ -475,6 +475,13 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
475 475 repelled = true
476 476 end
477 477 end
  478 +
  479 + -- Dwarves stoneskin
  480 + if target:attr("auto_stoneskin") and rng.percent(15) then
  481 + game.logSeen(target, "#ORCHID#%s instinctively hardens %s skin and ignores the attack!#LAST#", target.name:capitalize(), string.his_her(target))
  482 + target:setEffect(target.EFF_STONE_SKIN, 5, {power=target:attr("auto_stoneskin")})
  483 + repelled = true
  484 + end
478 485
479 486 if repelled then
480 487 self:logCombat(target, "#Target# repels an attack from #Source#.")
... ... @@ -847,11 +854,6 @@ function _M:attackTargetHitProcs(target, weapon, dam, apr, armor, damtype, mult,
847 854 t.do_terror(self, t, target, dam)
848 855 end
849 856
850   - -- Dwarves stoneskin
851   - if hitted and not target.dead and target:attr("auto_stoneskin") and rng.percent(15) then
852   - target:setEffect(target.EFF_STONE_SKIN, 5, {power=target:attr("auto_stoneskin")})
853   - end
854   -
855 857 -- Psi Auras
856 858 local psiweapon = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
857 859 if psiweapon and psiweapon.combat and psiweapon.subtype ~= "mindstar" then
... ...
... ... @@ -458,7 +458,8 @@ newTalent{
458 458 end,
459 459 info = function(self, t)
460 460 return ([[Dwarf skin is a complex structure, it can automatically react to physical blows to harden itself.
461   - When you are hit in melee, you have a 15%% chance to increase your armour total by %d for 5 turns.]]):
  461 + When you are hit in melee, you have a 15%% chance to increase your armour total by %d for 5 turns and fully ignore the attack triggering it.
  462 + There is no cooldown to this effect, it can happen while already active.]]):
462 463 format(t.armor(self, t))
463 464 end,
464 465 }
... ...