From 12fc06dae947afad67987e875e0b1693c8a3b3d2 Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Sat, 31 Jul 2010 00:56:21 +0000 Subject: [PATCH] Example module now uses display strings and shows a tooltip for Grids git-svn-id: http://svn.net-core.org/repos/t-engine4@959 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/example/class/Actor.lua | 3 ++- game/modules/example/class/Grid.lua | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/game/modules/example/class/Actor.lua b/game/modules/example/class/Actor.lua index 09baf192c5..b19d11c69f 100644 --- a/game/modules/example/class/Actor.lua +++ b/game/modules/example/class/Actor.lua @@ -96,11 +96,12 @@ function _M:move(x, y, force) end function _M:tooltip() - return ([[%s + return ([[%s%s #00ffff#Level: %d #ff0000#HP: %d (%d%%) Stats: %d / %d / %d %s]]):format( + self:getDisplayString(), self.name, self.level, self.life, self.life * 100 / self.max_life, diff --git a/game/modules/example/class/Grid.lua b/game/modules/example/class/Grid.lua index f6df667897..243de3f321 100644 --- a/game/modules/example/class/Grid.lua +++ b/game/modules/example/class/Grid.lua @@ -54,15 +54,15 @@ function _M:on_move(x, y, who, forced) end end end - function _M:tooltip() if self.show_tooltip then local name = ((self.show_tooltip == true) and self.name or self.show_tooltip) if self.desc then - return name.."\n"..self.desc + return self:getDisplayString()..name.."\n"..self.desc else - return name + return self:getDisplayString()..name end + else + return self:getDisplayString()..self.name end end - -- GitLab