From f9482b84806c0d21875330935f2fddc2b2e20f68 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 30 Dec 2012 15:08:16 +0000
Subject: [PATCH] Flexible Combat reduced to always 60%
git-svn-id: http://svn.net-core.org/repos/t-engine4@6289 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/interface/Combat.lua | 4 +---
game/modules/tome/data/talents/uber/str.lua | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 4db24aa03f..939f82d5fa 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -217,9 +217,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unharmed)
if self:attr("unharmed_attack_on_hit") then
local v = self:attr("unharmed_attack_on_hit")
self:attr("unharmed_attack_on_hit", -v)
- if mean == "weapon" then self:attackTarget(target, nil, 1, true, true)
- elseif mean == "unharmed" and rng.percent(60) then self:attackTarget(target, nil, 1, true, true)
- end
+ if mean == "unharmed" and rng.percent(60) then self:attackTarget(target, nil, 1, true, true) end
self:attr("unharmed_attack_on_hit", v)
end
diff --git a/game/modules/tome/data/talents/uber/str.lua b/game/modules/tome/data/talents/uber/str.lua
index 519a2470d9..4d1ff8630b 100644
--- a/game/modules/tome/data/talents/uber/str.lua
+++ b/game/modules/tome/data/talents/uber/str.lua
@@ -29,7 +29,7 @@ uberTalent{
self:attr("show_gloves_combat", -1)
end,
info = function(self, t)
- return ([[Each time you make a melee attack, you have a 100%% chance to do an additional unarmed strike, if using weapons. This is instead a 60%% chance if you are already fighting unarmed.]])
+ return ([[Each time you make a melee attack, you have a 60%% chance to do an additional unarmed strike.]])
:format()
end,
}
--
GitLab