From 5ef5bd30972563594813132eadcf885abcf54d1e Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 26 Feb 2012 09:13:42 +0000
Subject: [PATCH] Fixed Shooting when encased in ice Improved Jelly description
git-svn-id: http://svn.net-core.org/repos/t-engine4@4928 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Player.lua | 3 +++
game/modules/tome/data/talents/gifts/summon-melee.lua | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 1a616eb81f..cf1599baa5 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -558,6 +558,9 @@ end
--- Tries to get a target from the user
function _M:getTarget(typ)
if self:attr("encased_in_ice") then
+ if type(typ) ~= "table" then
+ return self.x, self.y, self
+ end
local orig_range = typ.range
typ.range = 0
local x, y, act = game:targetGetForPlayer(typ)
diff --git a/game/modules/tome/data/talents/gifts/summon-melee.lua b/game/modules/tome/data/talents/gifts/summon-melee.lua
index 2bccf865da..d649f5c474 100644
--- a/game/modules/tome/data/talents/gifts/summon-melee.lua
+++ b/game/modules/tome/data/talents/gifts/summon-melee.lua
@@ -193,9 +193,8 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Summon a Jelly for %d turns to attack your foes. Jellies do not move, but are great to block a passage.
+ return ([[Summon a Jelly for %d turns to attack your foes. Jellies do not move, but your equilibrium will be reduced by 10%% of all damage received by the jelly.
It will get %d constitution and %d strength.
- When your jelly it absorbs 10%% of the damage taken and uses it to decrease your equilibrium.
Your summons inherit some of your stats: increased damage%%, stun/pin/confusion/blindness resistance, armour penetration.
Constitution stat will increase with your Willpower stat.]])
:format(math.ceil(self:getTalentLevel(t)) + 5 + self:getTalentLevelRaw(self.T_RESILIENCE),
--
GitLab