From 12e8a902c5070dc1e63ad551178a3749ca25eebf Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 4 Dec 2012 17:18:53 +0000
Subject: [PATCH] Cripple damage increased, now reduced spell, mind, melee
speed instead of damage and attack
git-svn-id: http://svn.net-core.org/repos/t-engine4@5913 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/interface/Combat.lua | 5 ++++
.../tome/data/talents/cunning/dirty.lua | 29 +++++++------------
.../tome/data/timed_effects/physical.lua | 13 ++++-----
3 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 334d2e9c8b..fa7f009552 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -684,6 +684,11 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
weapon.special_on_kill.fct(weapon, self, target)
end
+ if hitted and crit and not target.dead and self:knowTalent(self.T_BACKSTAB) and not target:attr("stunned") and rng.percent(self:getTalentLevel(self.T_BACKSTAB) * 3) then
+ if target:canBe("stun") then
+ target:setEffect(target.EFF_STUNNED, 3, {apply_power=self:combatAttack()})
+ end
+ end
-- Poison coating
if hitted and not target.dead and self.vile_poisons and next(self.vile_poisons) and target:canBe("poison") then
diff --git a/game/modules/tome/data/talents/cunning/dirty.lua b/game/modules/tome/data/talents/cunning/dirty.lua
index 80c87d7c85..6947f9bb00 100644
--- a/game/modules/tome/data/talents/cunning/dirty.lua
+++ b/game/modules/tome/data/talents/cunning/dirty.lua
@@ -67,10 +67,11 @@ newTalent{
points = 5,
require = cuns_req2,
getCriticalChance = function(self, t) return self:getTalentLevel(t) * 10 end,
+ getStunChance = function(self, t) return self:getTalentLevel(t) * 3 end,
info = function(self, t)
- local chance = t.getCriticalChance(self, t)
- return ([[Your quick wit gives you a big advantage against stunned targets; all your hits will have a %d%% greater chance of being critical.]]):
- format(chance)
+ return ([[Your quick wit gives you a big advantage against stunned targets; all your hits will have a %d%% greater chance of being critical.
+ Also your melee critical strikes have %d%% chance to stun the target for 3 turns.]]):
+ format(t.getCriticalChance(self, t), t.getStunChance(self, t))
end,
}
newTalent{
@@ -125,10 +126,9 @@ newTalent{
require = cuns_req4,
requires_target = true,
tactical = { DISABLE = 2, ATTACK = {weapon = 2} },
- getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.9, 1.4) end,
+ getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 1.9) end,
getDuration = function(self, t) return 3 + math.ceil(self:getTalentLevel(t)) end,
- getAttackPenalty = function(self, t) return 5 + self:combatTalentStatDamage(t, "cun", 10, 60) end,
- getDamagePenalty = function(self, t) return 5 + self:combatTalentStatDamage(t, "cun", 10, 50) end,
+ getSpeedPenalty = function(self, t) return 20 + self:combatTalentStatDamage(t, "cun", 5, 50) end,
action = function(self, t)
local tg = {type="hit", range=self:getTalentRange(t)}
local x, y, target = self:getTarget(tg)
@@ -137,14 +137,8 @@ newTalent{
local hitted = self:attackTarget(target, nil, t.getDamage(self, t), true)
if hitted then
- local tw = target:getInven("MAINHAND")
- if tw then
- tw = tw[1] and tw[1].combat
- end
- tw = tw or target.combat
- local atk = target:combatAttack(tw) * (t.getAttackPenalty(self, t)) / 100
- local dam = target:combatDamage(tw) * (t.getDamagePenalty(self, t)) / 100
- target:setEffect(target.EFF_CRIPPLE, t.getDuration(self, t), {atk=atk, dam=dam, apply_power=self:combatAttack()})
+ local speed = t.getSpeedPenalty(self, t) / 100
+ target:setEffect(target.EFF_CRIPPLE, t.getDuration(self, t), {speed=speed, apply_power=self:combatAttack()})
end
return true
@@ -152,11 +146,10 @@ newTalent{
info = function(self, t)
local damage = t.getDamage(self, t)
local duration = t.getDuration(self, t)
- local attackpen = t.getAttackPenalty(self, t)
- local damagepen = t.getDamagePenalty(self, t)
- return ([[You hit your target doing %d%% damage. If your attack hits, the target is crippled for %d turns, losing %d%% accuracy and %d%% damage.
+ local speedpen = t.getSpeedPenalty(self, t)
+ return ([[You hit your target doing %d%% damage. If your attack hits, the target is crippled for %d turns, losing %d%% melee, spellcasting and mind speed.
Hit chance improves with talent level and your Dexterity stat.]]):
- format(100 * damage, duration, attackpen, damagepen)
+ format(100 * damage, duration, speedpen)
end,
}
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index 581b39387f..43d77ac511 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -806,20 +806,17 @@ newEffect{
newEffect{
name = "CRIPPLE", image = "talents/cripple.png",
desc = "Cripple",
- long_desc = function(self, eff) return ("The target is crippled, reducing attack by %d and damage by %d."):format(eff.atk, eff.dam) end,
+ long_desc = function(self, eff) return ("The target is crippled, reducing melee, spellcasting and mind speed by %d%%."):format(eff.speed) end,
type = "physical",
subtype = { wound=true },
status = "detrimental",
- parameters = { atk=10, dam=10 },
+ parameters = { speed=0.3 },
on_gain = function(self, err) return "#Target# is crippled." end,
on_lose = function(self, err) return "#Target# is not cripple anymore." end,
activate = function(self, eff)
- eff.atkid = self:addTemporaryValue("combat_atk", -eff.atk)
- eff.damid = self:addTemporaryValue("combat_dam", -eff.dam)
- end,
- deactivate = function(self, eff)
- self:removeTemporaryValue("combat_atk", eff.atkid)
- self:removeTemporaryValue("combat_dam", eff.damid)
+ self:effectTemporaryValue(eff, "combat_physspeed", -eff.speed)
+ self:effectTemporaryValue(eff, "combat_spellspeed", -eff.speed)
+ self:effectTemporaryValue(eff, "combat_mindspeed", -eff.speed)
end,
}
--
GitLab