From d2959b4eba3cc90a19b4e042d16fa29def6441bc Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 28 Nov 2011 15:58:11 +0000
Subject: [PATCH] hum
git-svn-id: http://svn.net-core.org/repos/t-engine4@4694 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 2 +-
game/modules/tome/data/damage_types.lua | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index a3017cfb21..3355bf4023 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -1192,7 +1192,7 @@ function _M:setupCommands()
end end
end end,
[{"_g","ctrl"}] = function() if config.settings.cheat then
- self.level.map:particleEmitter(game.player.x, game.player.y, 1, "fog", {})
+ self.player:setEffect(self.player.EFF_FROZEN, 10, {hp=1})
end end,
[{"_f","ctrl"}] = function() if config.settings.cheat then
self.player.quests["love-melinda"] = nil
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index db56d276d8..6068e14779 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -81,9 +81,13 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
if eff.hp < 0 and not eff.begone then
game.logSeen(src, "%s forces the iceblock to shatter.", src.name:capitalize())
game:onTickEnd(function() src:removeEffect(src.EFF_FROZEN) end)
- eff.begone = true
+ eff.begone = game.turn
else
game:delayedLogDamage(src, {name="Iceblock", x=src.x, y=src.y}, dam, ("%s%d %s#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", math.ceil(dam), DamageType:get(type).name))
+ if eff.begone and eff.begone < game.turn and eff.hp < 0 then
+ game.logSeen(src, "%s forces2 the iceblock to shatter.", src.name:capitalize())
+ src:removeEffect(src.EFF_FROZEN)
+ end
end
return 0
end
--
GitLab