plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@2268 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Actor.lua

@@ -642,6 +642,7 @@ function _M:tooltip(x, y, seen_by)
 	local ts = tstring{}
 	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}, true)
 	ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
+	ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
 	ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)
 	ts:add(("Exp: %d/%d"):format(self.exp, self:getExpChart(self.level+1) or "---"), true)
 	ts:add({"color", 255, 0, 0}, ("HP: %d (%d%%)"):format(self.life, self.life * 100 / self.max_life), {"color", "WHITE"}, true)

game/modules/tome/class/WorldNPC.lua

@@ -113,23 +113,20 @@ function _M:tooltip(x, y, seen_by)
 
 	local rank, rank_color = self:TextRank()
 
-	return ([[%s%s%s
-%s / %s
-Rank: %s%s
-#00ffff#Level: %d
-%s
-Faction: %s%s (%s, %d)
-Target: %s
-UID: %d]]):format(
-	self:getDisplayString(), rank_color, self.name,
-	self.type:capitalize(), self.subtype:capitalize(),
-	rank_color, rank,
-	self.level,
-	self.desc or "",
-	factcolor, Faction.factions[self.faction].name, factstate, factlevel,
-	self.ai_target.actor and self.ai_target.actor.name or "none",
-	self.uid
+	local ts = tstring{}
+	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}, true)
+	ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
+	ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
+	ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)
+	ts:add(self.desc, true)
+	ts:add("Faction: ") ts:merge(factcolor:toTString()) ts:add(("%s (%s, %d)"):format(Faction.factions[self.faction].name, factstate, factlevel), {"color", "WHITE"}, true)
+	ts:add(
+		("Killed by you: "):format(killed), true,
+		"Target: ", self.ai_target.actor and self.ai_target.actor.name or "none", true,
+		"UID: "..self.uid
 	)
+
+	return ts
 end
 
 function _M:die(src)