From b581efde2c9f1e49142971819f55edd75738130d Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Wed, 12 Dec 2012 01:16:51 +0000 Subject: [PATCH] for later git-svn-id: http://svn.net-core.org/repos/t-engine4@6048 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/tome/data/damage_types.lua | 13 +++++++++++++ game/modules/tome/data/talents/uber/cun.lua | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua index 36aa411a79..0c8ebecd8b 100644 --- a/game/modules/tome/data/damage_types.lua +++ b/game/modules/tome/data/damage_types.lua @@ -32,6 +32,19 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr) if dam <= 0 then return add_dam end end + if src:attr("elemental_mastery") then + local ndam = dam * 0.3 + local old = src.elemental_mastery + src.elemental_mastery = nil + dam = 0 + dam = dam + DamageType:get(DamageType.FIRE).projector(src, x, y, DamageType.FIRE, ndam, tmp, no_martyr) + dam = dam + DamageType:get(DamageType.COLD).projector(src, x, y, DamageType.COLD, ndam, tmp, no_martyr) + dam = dam + DamageType:get(DamageType.LIGHTNING).projector(src, x, y, DamageType.LIGHTNING, ndam, tmp, no_martyr) + dam = dam + DamageType:get(DamageType.ARCANE).projector(src, x, y, DamageType.ARCANE, ndam, tmp, no_martyr) + src.elemental_mastery = old + return dam + end + local terrain = game.level.map(x, y, Map.TERRAIN) if terrain then terrain:check("damage_project", src, x, y, type, dam) end diff --git a/game/modules/tome/data/talents/uber/cun.lua b/game/modules/tome/data/talents/uber/cun.lua index 8c64874d03..89a1d885ea 100644 --- a/game/modules/tome/data/talents/uber/cun.lua +++ b/game/modules/tome/data/talents/uber/cun.lua @@ -241,7 +241,7 @@ uberTalent{ return ([[All physical criticals reduce the remaining cooldown of a random technique or cunning talent by 2. All spell criticals reduce the remaining cooldown of a random spell talent by 1. All mind criticals reduce the remaining cooldown of a random wild gift/psionic/afflicted talent by 2. - This can only happen once per turn and can not affect the talent thtat procs it.]]) + This can only happen once per turn and can not affect the talent that procs it.]]) :format() end, } -- GitLab