From ab905dc84a3811e966e9911e3c304c864fa15485 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sat, 11 Sep 2010 01:18:32 +0000
Subject: [PATCH] Amulets of the fish now have a description
git-svn-id: http://svn.net-core.org/repos/t-engine4@1182 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Object.lua | 8 ++++++++
game/modules/tome/data/general/npcs/jelly.lua | 13 +++++++++++++
2 files changed, 21 insertions(+)
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 0f77b61932..e042a9634e 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -287,6 +287,14 @@ function _M:getTextualDesc()
desc[#desc+1] = ("Reduces talent cooldowns: %s."):format(table.concat(tcds, ','))
end
+ if w.can_breath then
+ local ts = {}
+ for what, _ in pairs(w.can_breath) do
+ ts[#ts+1] = what
+ end
+ desc[#desc+1] = ("Allows you to breathe in: %s."):format(table.concat(ts, ','))
+ end
+
if w.combat_physresist then desc[#desc+1] = ("Increases physical save: %s."):format(w.combat_physresist) end
if w.combat_spellresist then desc[#desc+1] = ("Increases spell save: %s."):format(w.combat_spellresist) end
if w.combat_mentalresist then desc[#desc+1] = ("Increases mental save: %s."):format(w.combat_mentalresist) end
diff --git a/game/modules/tome/data/general/npcs/jelly.lua b/game/modules/tome/data/general/npcs/jelly.lua
index 9344b10b8e..a16a7c94ef 100644
--- a/game/modules/tome/data/general/npcs/jelly.lua
+++ b/game/modules/tome/data/general/npcs/jelly.lua
@@ -96,3 +96,16 @@ newEntity{ base = "BASE_NPC_JELLY",
max_life = resolvers.rngavg(5,9),
combat = { dam=5, atk=15, apr=5, damtype=DamageType.ACID },
}
+
+newEntity{ base = "BASE_NPC_JELLY",
+ name = "Malevolent Dimentional Jelly", color=colors.VIOLET, image="npc/jelly-darkgrey.png",
+ desc = "A strange black blob on the dungeon floor, through it you seem to be able to see other times and places. As you stare you see things moving out of it.",
+ level_range = {1, 25}, exp_worth = 1,
+ rarity = 1,
+ max_life = resolvers.rngavg(5,9),
+ combat = { dam=5, atk=15, apr=5, damtype=DamageType.ACID },
+ summon = {
+ {number=1, hasexp=false},
+ },
+ resolvers.talents{ [Talents.T_SUMMON]=1,},
+}
--
GitLab