From b02879f42271bfe263f09c28998432e190621d6c Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 4 Dec 2012 21:35:09 +0000
Subject: [PATCH] typos
git-svn-id: http://svn.net-core.org/repos/t-engine4@5921 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/interface/Combat.lua | 7 ++++---
game/modules/tome/data/talents/cunning/dirty.lua | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index fa7f009552..25c1379b2e 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -1169,9 +1169,10 @@ end
function _M:getOffHandMult(combat, mult)
local offmult = (mult or 1) / 2
if self:knowTalent(Talents.T_DUAL_WEAPON_TRAINING) then
- offmult = (mult or 1) / (2 - (math.min(self:getTalentLevel(Talents.T_DUAL_WEAPON_TRAINING), 8) / 6))
- elseif self:knowTalent(Talents.T_CORRUPTED_STRENGTH) then
- offmult = (mult or 1) / (2 - (math.min(self:getTalentLevel(Talents.T_CORRUPTED_STRENGTH), 8) / 9))
+ offmult = math.max(offmult, (mult or 1) / (2 - (math.min(self:getTalentLevel(Talents.T_DUAL_WEAPON_TRAINING), 8) / 6)))
+ end
+ if self:knowTalent(Talents.T_CORRUPTED_STRENGTH) then
+ offmult = math.max(offmult, (mult or 1) / (2 - (math.min(self:getTalentLevel(Talents.T_CORRUPTED_STRENGTH), 8) / 9)))
end
if self:hasEffect(self.EFF_CURSE_OF_MADNESS) then
local eff = self:hasEffect(self.EFF_CURSE_OF_MADNESS)
diff --git a/game/modules/tome/data/talents/cunning/dirty.lua b/game/modules/tome/data/talents/cunning/dirty.lua
index 6947f9bb00..298d28757e 100644
--- a/game/modules/tome/data/talents/cunning/dirty.lua
+++ b/game/modules/tome/data/talents/cunning/dirty.lua
@@ -54,8 +54,8 @@ newTalent{
local damage = t.getDamage(self, t)
local duration = t.getDuration(self, t)
return ([[You hit your target doing %d%% damage, trying to stun it instead of damaging it. If your attack hits, the target is stunned for %d turns.
- Stun chance increase your accuracy.
- If you fail to stun the target (of if it shrugs the effect) you quickly get back on your feet, not using your current turn.]]):
+ Stun chance increase with your accuracy.
+ If you fail to stun the target (or if it shrugs the effect) you quickly get back on your feet, not using your current turn.]]):
format(100 * damage, duration)
end,
}
--
GitLab