From 6c948f8fd6359a6f0081d4e762515d9424d0c3d2 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Mon, 4 Nov 2013 09:33:34 +0100
Subject: [PATCH] gfx effect of nature's touch shows up on the target
Resting will not spam the log with messages about party members healing
---
game/modules/tome/class/Actor.lua | 2 +-
game/modules/tome/data/talents/gifts/call.lua | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 7022ef2b19..b51e983580 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -1572,7 +1572,7 @@ function _M:onHeal(value, src)
end
-- print("[HEALING]", self.uid, self.name, "for", value)
- if not self.resting and value + psi_heal >= 1 then
+ if (not self.resting and (not game.party:hasMember(self) or not game:getPlayer(true).resting)) and value + psi_heal >= 1 then
if game.level.map.seens(self.x, self.y) then
local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
game.flyers:add(sx, sy, 30, rng.float(-3, -2), (rng.range(0,2)-1) * 0.5, tostring(math.ceil(value)), {255,255,0})
diff --git a/game/modules/tome/data/talents/gifts/call.lua b/game/modules/tome/data/talents/gifts/call.lua
index 46baa16467..27fceffdc9 100644
--- a/game/modules/tome/data/talents/gifts/call.lua
+++ b/game/modules/tome/data/talents/gifts/call.lua
@@ -93,8 +93,8 @@ newTalent{ short_name = "NATURE_TOUCH",
target:heal(self:mindCrit(20 + self:combatTalentMindDamage(t, 20, 500)), self)
target:attr("allow_on_heal", -1)
if core.shader.active(4) then
- self:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
- self:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
+ target:addParticles(Particles.new("shader_shield_temp", 1, {toback=true ,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0}))
+ target:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healgreen", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0}))
end
end
game:playSoundNear(self, "talents/heal")
--
GitLab