From 01afb322cf745c2e4a0f37f5eddcb27593d3e7bb Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Fri, 24 Aug 2012 18:29:15 +0000 Subject: [PATCH] fix git-svn-id: http://svn.net-core.org/repos/t-engine4@5558 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/tome/class/Player.lua | 2 ++ game/modules/tome/data/damage_types.lua | 4 ++++ .../data/general/objects/special-artifacts.lua | 3 ++- .../tome/data/gfx/talents/elemental_surge.png | Bin 0 -> 4275 bytes .../tome/data/gfx/talents/secrets_of_telos.png | Bin 0 -> 3557 bytes game/modules/tome/data/talents/uber/cun.lua | 17 +++++++++++++++++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 game/modules/tome/data/gfx/talents/elemental_surge.png create mode 100644 game/modules/tome/data/gfx/talents/secrets_of_telos.png diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua index 164521a397..90e8162d87 100644 --- a/game/modules/tome/class/Player.lua +++ b/game/modules/tome/class/Player.lua @@ -91,6 +91,8 @@ function _M:init(t, no_default) self.died_times = self.died_times or {} self.last_learnt_talents = self.last_learnt_talents or { class={}, generic={} } self.puuid = self.puuid or util.uuid() + + self.damage_log = self.damage_log or {} end function _M:onBirth(birther) diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua index ff8da71095..df59d26f6e 100644 --- a/game/modules/tome/data/damage_types.lua +++ b/game/modules/tome/data/damage_types.lua @@ -341,6 +341,10 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr) game.logSeen(target, "%s is healed by the %s%s#LAST# damage!", target.name:capitalize(), DamageType:get(type).text_color or "#aaaaaa#", DamageType:get(type).name) end + if dam > 0 and src.damage_log then + src.damage_log[type] = (src.damage_log[type] or 0) + dam + end + if dam > 0 and source_talent then local t = source_talent diff --git a/game/modules/tome/data/general/objects/special-artifacts.lua b/game/modules/tome/data/general/objects/special-artifacts.lua index e0ac36e777..3d8313ebe0 100644 --- a/game/modules/tome/data/general/objects/special-artifacts.lua +++ b/game/modules/tome/data/general/objects/special-artifacts.lua @@ -20,6 +20,8 @@ local Stats = require "engine.interface.ActorStats" local Talents = require "engine.interface.ActorTalents" +load("/data/general/objects/staves.lua") + -- This file describes artifacts not bound to a special location or quest, but still special(they do not get randomly generated) newEntity{ base = "BASE_STAFF", define_as = "TELOS_SPIRE", @@ -59,6 +61,5 @@ newEntity{ base = "BASE_STAFF", define_as = "TELOS_SPIRE", damage_affinity = { [DamageType.ARCANE] = 15, [DamageType.BLIGHT] = 15, [DamageType.COLD] = 15, [DamageType.DARKNESS] = 15, [DamageType.ACID] = 15, [DamageType.LIGHT] = 15, }, confusion_immune = 0.4, vim_on_crit = 6, - learn_talent = {[Talents.T_COMMAND_STAFF] = 1,}, }, } diff --git a/game/modules/tome/data/gfx/talents/elemental_surge.png b/game/modules/tome/data/gfx/talents/elemental_surge.png new file mode 100644 index 0000000000000000000000000000000000000000..b193c4657cdba8d9211242cfbaebcb2d39cc1aaa GIT binary patch literal 4275 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 Vl0o2-12_Nx002ovPDHLkV1f}8GxGod literal 0 HcmV?d00001 diff --git a/game/modules/tome/data/gfx/talents/secrets_of_telos.png b/game/modules/tome/data/gfx/talents/secrets_of_telos.png new file mode 100644 index 0000000000000000000000000000000000000000..d142b503f6bca0be078a9b404b90dce2f204b6ca GIT binary patch literal 3557 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 literal 0 HcmV?d00001 diff --git a/game/modules/tome/data/talents/uber/cun.lua b/game/modules/tome/data/talents/uber/cun.lua index 4d3b6368f9..b7bc6c9301 100644 --- a/game/modules/tome/data/talents/uber/cun.lua +++ b/game/modules/tome/data/talents/uber/cun.lua @@ -81,6 +81,13 @@ uberTalent{ uberTalent{ name = "Endless Woes", mode = "passive", + require = { special={desc="Dealt over 50000 acid, blight or darkness damage", fct=function(self) return + self.damage_log and ( + (self.damage_log[DamageType.ACID] and self.damage_log[DamageType.ACID] >= 50000) or + (self.damage_log[DamageType.BLIGHT] and self.damage_log[DamageType.BLIGHT] >= 50000) or + (self.damage_log[DamageType.DARKNESS] and self.damage_log[DamageType.DARKNESS] >= 50000) + ) + end} }, trigger = function(self, t, target, damtype, dam) if dam < 150 then return end if damtype == DamageType.ACID and rng.percent(15) then @@ -141,6 +148,16 @@ uberTalent{ uberTalent{ name = "Elemental Surge", mode = "passive", + require = { special={desc="Dealt over 50000 arcane, fire, cold, lightning, light or nature damage", fct=function(self) return + self.damage_log and ( + (self.damage_log[DamageType.ARCANE] and self.damage_log[DamageType.ARCANE] >= 50000) or + (self.damage_log[DamageType.FIRE] and self.damage_log[DamageType.FIRE] >= 50000) or + (self.damage_log[DamageType.COLD] and self.damage_log[DamageType.COLD] >= 50000) or + (self.damage_log[DamageType.LIGHTNING] and self.damage_log[DamageType.LIGHTNING] >= 50000) or + (self.damage_log[DamageType.LIGHT] and self.damage_log[DamageType.LIGHT] >= 50000) or + (self.damage_log[DamageType.NATURE] and self.damage_log[DamageType.NATURE] >= 50000) + ) + end} }, trigger = function(self, t, target, damtype, dam) if dam < 150 then return end if damtype == DamageType.ARCANE and rng.percent(15) then -- GitLab