diff --git a/game/modules/tome/data/talents/chronomancy/bow-threading.lua b/game/modules/tome/data/talents/chronomancy/bow-threading.lua index b9bea7769ad2da3cd1e6afc8b60d4906bc74c72d..6d2aa16d2892864a5abe56bd18011d94506560a4 100644 --- a/game/modules/tome/data/talents/chronomancy/bow-threading.lua +++ b/game/modules/tome/data/talents/chronomancy/bow-threading.lua @@ -148,7 +148,7 @@ newTalent{ local damage = t.getDamage(self, t) * 100 local penalty = t.getDamagePenalty(self, t) return ([[Fire an arrow for %d%% weapon damage and call up to 2 wardens (depending on available space) that will each fire a single arrow before returning to their timelines. - The wardens are out of phase with normal reality and deal %d%% damage but shoot through friendly targets.]]) + The wardens are out of phase with normal reality and deal %d%% less damage but shoot through friendly targets.]]) :format(damage, penalty) end } diff --git a/game/modules/tome/data/talents/chronomancy/flux.lua b/game/modules/tome/data/talents/chronomancy/flux.lua index 4f0c0e3b7bd020cfb8bc05eb9aad1c9d15dc3eea..b4ec57697536ed303d749ddf6c88ecb5c1fe2a5b 100644 --- a/game/modules/tome/data/talents/chronomancy/flux.lua +++ b/game/modules/tome/data/talents/chronomancy/flux.lua @@ -178,7 +178,6 @@ newTalent{ game.logPlayer(self, "#STEEL_BLUE#You take control of %s.", self:getTalentFromId(talent).name or nil) self:setEffect(self.EFF_TWIST_FATE, t.getDuration(self, t), {talent=talent, paradox=paradox}) - game.level.map:particleEmitter(self.x, self.y, 1, "generic_charge", {rm=70, rM=176, gm=130, gM=196, bm=180, bM=222, am=125, aM=125}) end, action = function(self, t) t.doTwistFate(self, t, true) diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua index 1a8c75a2341f4dbcefa20194edd0a5bcf46c6c7e..74bea1e818da179cad3f7ecb5406d4170440d413 100644 --- a/game/modules/tome/data/timed_effects/other.lua +++ b/game/modules/tome/data/timed_effects/other.lua @@ -2623,8 +2623,8 @@ newEffect{ subtype = { time=true }, status = "detrimental", parameters = { paradox=10 }, - on_gain = function(self, err) return "#Target# converts damage into paradox.", "+Preserve" end, - on_lose = function(self, err) return "#Target# stops converting damage to paradox..", "-Preserve" end, + on_gain = function(self, err) return "#Target# converts damage into paradox.", "+Smearing" end, + on_lose = function(self, err) return "#Target# stops converting damage to paradox..", "-Smearing" end, on_merge = function(self, old_eff, new_eff) -- Merge the flames! local oldparadox = old_eff.paradox * old_eff.dur @@ -2637,7 +2637,9 @@ newEffect{ end, activate = function(self, eff) if core.shader.allow("adv") then - eff.particle1, eff.particle2 = self:addParticles3D("volumetric", {kind="fast_sphere", radius=1.6, twist=30, density=30, growSpeed=0.004, scrollingSpeed=-0.004, img="continuum_01_3"}) + eff.particle1, eff.particle2 = self:addParticles3D("volumetric", {kind="conic_cylinder", radius=1, base_rotation=180, growSpeed=0.004, img="continuum_01_3"}) + else + eff.particle1 = self:addParticles(Particles.new("time_shield", 1)) end end, deactivate = function(self, eff) @@ -2729,8 +2731,13 @@ newEffect{ on_gain = function(self, err) return nil, "+Twist Fate" end, on_lose = function(self, err) return nil, "-Twist Fate" end, activate = function(self, eff) + if core.shader.allow("adv") then + eff.particle1, eff.particle2 = self:addParticles3D("volumetric", {kind="fast_sphere", appear=10, radius=1.6, twist=30, density=30, growSpeed=0.004, scrollingSpeed=-0.004, img="continuum_01_3"}) + end end, deactivate = function(self, eff) + self:removeParticles(eff.particle1) + self:removeParticles(eff.particle2) if not game.zone.wilderness and not self.dead then if not eff.twisted then self:forceUseTalent(eff.talent, {force_target=self})