Added icons for main menu/craetures display/talent display

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

game/engines/default/engine/ActorsSeenDisplay.lua

@@ -85,7 +85,7 @@ function _M:display()
 	table.sort(l, function(a, b) return a.name < b.name end)
 
 	for i, a in ipairs(l) do
-		self.surface:drawColorStringBlended(self.font, ("%s (%d)#WHITE#; distance [%s]"):format(a.name, a.nb, table.concat(a.dist, ",")), 0, (i - 1) * self.font_h, a.color[1], a.color[2], a.color[3])
+		self.surface:drawColorStringBlended(self.font, ("%s (%d)#WHITE#; distance [%s]"):format(a.name, a.nb, table.concat(a.dist, ",")), 3, 3 + (i - 1) * self.font_h, a.color[1], a.color[2], a.color[3])
 	end
 
 	self.surface:updateTexture(self.texture)

game/engines/default/engine/KeyBind.lua

@@ -208,6 +208,12 @@ function _M:receiveKey(sym, ctrl, shift, alt, meta, unicode, isup, ismouse)
 	engine.KeyCommand.receiveKey(self, sym, ctrl, shift, alt, meta, unicode, isup)
 end
 
+--- Force a key to trigger
+function _M:triggerVirtual(virtual)
+	if not self.virtuals[virtual] then return end
+	self.virtuals[virtual]()
+end
+
 --- Adds a key/command combinaison
 -- @param sym the key to handle
 -- @param mods a table with the mod keys needed, i.e: {"ctrl", "alt"}

game/engines/default/engine/Tooltip.lua

@@ -32,6 +32,7 @@ function _M:init(fontname, fontsize, color, bgcolor, max)
 	self.font_h = self.font:lineSkip()
 	self.max = max or 300
 	self.changed = true
+	self.old_text = ""
 	self.old_tmx, self.old_tmy = -1,-1
 	self.old_turn = -1
 end
@@ -112,27 +113,38 @@ end
 -- @param tmy the map coordinate to get tooltip from
 -- @param mx the screen coordinate to display at, if nil it will be computed from tmx
 -- @param my the screen coordinate to display at, if nil it will be computed from tmy
-function _M:displayAtMap(tmx, tmy, mx, my)
+-- @param text a text to display, if nil it will interrogate the map under the mouse using the "tooltip" property
+function _M:displayAtMap(tmx, tmy, mx, my, text)
 	if not mx then
 		mx, my = game.level.map:getTileToScreen(tmx, tmy)
 	end
 
-	if self.old_tmx ~= tmx or self.old_tmy ~= tmy or (game.paused and self.old_turn ~= game.turn) then
-		self.old_tmx, self.old_tmy = tmx, tmy
-		self.old_turn = game.turn
-		local tt = {}
-		local seen = game.level.map.seens(tmx, tmy)
-		local remember = game.level.map.remembers(tmx, tmy)
-		tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
-		tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
-		tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
-		tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
-		tt[#tt+1] = remember and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
-		if #tt > 0 then
-			self:set("%s", table.concat(tt, "\n---\n"))
+	if text then
+		if text ~= self.old_text then
+			self:set("%s", text)
 			self:display()
-		else
-			self:erase()
+			print("set", text)
+			self.old_text = text
+		end
+	else
+		if self.old_tmx ~= tmx or self.old_tmy ~= tmy or (game.paused and self.old_turn ~= game.turn) then
+			self.old_text = ""
+			self.old_tmx, self.old_tmy = tmx, tmy
+			self.old_turn = game.turn
+			local tt = {}
+			local seen = game.level.map.seens(tmx, tmy)
+			local remember = game.level.map.remembers(tmx, tmy)
+			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.PROJECTILE, "tooltip", game.level.map.actor_player) or nil
+			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.ACTOR, "tooltip", game.level.map.actor_player) or nil
+			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.OBJECT, "tooltip", game.level.map.actor_player) or nil
+			tt[#tt+1] = seen and game.level.map:checkEntity(tmx, tmy, Map.TRAP, "tooltip", game.level.map.actor_player) or nil
+			tt[#tt+1] = remember and game.level.map:checkEntity(tmx, tmy, Map.TERRAIN, "tooltip", game.level.map.actor_player) or nil
+			if #tt > 0 then
+				self:set("%s", table.concat(tt, "\n---\n"))
+				self:display()
+			else
+				self:erase()
+			end
 		end
 	end
 

game/modules/tome/class/Game.lua

@@ -81,7 +81,7 @@ end
 
 function _M:run()
 	self.flash = LogFlasher.new(0, 0, self.w, 20, nil, nil, nil, {255,255,255}, {0,0,0})
-	self.logdisplay = LogDisplay.new(0, self.h * 0.8, self.w * 0.5, self.h * 0.2, nil, nil, nil, {255,255,255}, "/data/gfx/ui/message-log.png")
+	self.logdisplay = LogDisplay.new(0, self.h * 0.8, self.w * 0.5 - 18, self.h * 0.2, nil, nil, nil, {255,255,255}, "/data/gfx/ui/message-log.png")
 	self.player_display = PlayerDisplay.new(0, 220, 200, self.h * 0.8 - 220, {30,30,0})
 	self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
 	self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
@@ -90,6 +90,7 @@ function _M:run()
 	self.flyers = FlyingText.new()
 	self:setFlyingText(self.flyers)
 	self.minimap_bg, self.minimap_bg_w, self.minimap_bg_h = core.display.loadImage("/data/gfx/ui/minimap.png"):glTexture()
+	self.icons = { display_x = game.w * 0.5 - 14, display_y = game.h * 0.8 + 3, w = 12, h = game.h * 0.2}
 	self:createSeparators()
 
 	self.log = function(style, ...) if type(style) == "number" then self.logdisplay(...) self.flash(style, ...) else self.logdisplay(style, ...) self.flash(self.flash.NEUTRAL, style, ...) end end
@@ -183,10 +184,11 @@ function _M:onResolutionChange()
 	print("[RESOLUTION] changed to ", self.w, self.h)
 	self:setupDisplayMode()
 	self.flash:resize(0, 0, self.w, 20)
-	self.logdisplay:resize(0, self.h * 0.8, self.w * 0.5, self.h * 0.2)
+	self.logdisplay:resize(0, self.h * 0.8, self.w * 0.5 - 18, self.h * 0.2)
 	self.player_display:resize(0, 220, 200, self.h * 0.8 - 220)
 	self.hotkeys_display:resize(self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2)
 	self.npcs_display:resize(self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2)
+	self.icons = { display_x = game.w * 0.5 - 14, display_y = game.h * 0.8 + 3, w = 12, h = game.h * 0.2}
 	-- Reset mouse bindings to account for new size
 	self:setupMouse(reset)
 
@@ -474,9 +476,13 @@ function _M:display()
 	-- Separators
 	self.bottom_separator:toScreenFull(0, 20 - 3, self.w, 6, self.bottom_separator_w, self.bottom_separator_h)
 	self.bottom_separator:toScreenFull(0, self.h * 0.8 - 3, self.w, 6, self.bottom_separator_w, self.bottom_separator_h)
+	self.split_separator:toScreenFull(self.w * 0.5 - 3 - 15, self.h * 0.8, 6, self.h * 0.2, self.split_separator_w, self.split_separator_h)
 	self.split_separator:toScreenFull(self.w * 0.5 - 3, self.h * 0.8, 6, self.h * 0.2, self.split_separator_w, self.split_separator_h)
 	self.player_separator:toScreenFull(200 - 3, 20, 6, self.h * 0.8 - 20, self.player_separator_w, self.player_separator_h)
 
+	-- Icons
+	self:displayUIIcons()
+
 	-- Tooltip is displayed over all else
 	self:targetDisplayTooltip(self.w, self.h)
 
@@ -773,6 +779,11 @@ function _M:setupMouse(reset)
 	self.mouse:registerZone(self.hotkeys_display.display_x, self.hotkeys_display.display_y, self.w, self.h, function(button, mx, my, xrel, yrel)
 		self.hotkeys_display:onMouse(button, mx, my, not xrel)
 	end)
+	-- Use icons
+	self.mouse:registerZone(self.icons.display_x, self.icons.display_y, self.icons.w, self.icons.h, function(button, mx, my, xrel, yrel, bx, by)
+		self:mouseIcon(bx, by)
+		if button == "left" then self:clickIcon(bx, by) end
+	end)
 	if not reset then self.mouse:setCurrent() end
 end
 
@@ -837,6 +848,11 @@ function _M:placeRandomLoreObject(define)
 	end
 end
 
+
+--------------------------------------------------------------
+-- UI stuff
+--------------------------------------------------------------
+
 --- Create a visual separator
 local _sep_left = core.display.loadImage("/data/gfx/ui/separator-left.png") _sep_left:alpha()
 local _sep_right = core.display.loadImage("/data/gfx/ui/separator-right.png") _sep_right:alpha()
@@ -861,3 +877,36 @@ function _M:createVisualSeparator(dir, size)
 		return sep:glTexture()
 	end
 end
+
+local _talents_icon, _talents_icon_w, _talents_icon_h = core.display.loadImage("/data/gfx/ui/talents-icon.png"):glTexture()
+local _actors_icon, _actors_icon_w, _actors_icon_h = core.display.loadImage("/data/gfx/ui/actors-icon.png"):glTexture()
+local _main_menu_icon, _main_menu_icon_w, _main_menu_icon_h = core.display.loadImage("/data/gfx/ui/main-menu-icon.png"):glTexture()
+
+function _M:displayUIIcons()
+	local x, y = self.icons.display_x, self.icons.display_y
+	_talents_icon:toScreenFull(x, y, 12, 12, _talents_icon_w, _talents_icon_h) y = y + 12
+	_actors_icon:toScreenFull(x, y, 12, 12, _actors_icon_w, _actors_icon_h) y = y + 12
+	_main_menu_icon:toScreenFull(x, y, 12, 12, _main_menu_icon_w, _main_menu_icon_h) y = y + 12
+end
+
+function _M:clickIcon(bx, by)
+	if by < 12 then
+		self.show_npc_list = false
+		self.player.changed = true
+	elseif by < 24 then
+		self.show_npc_list = true
+		self.player.changed = true
+	elseif by < 36 then
+		self.key:triggerVirtual("EXIT")
+	end
+end
+
+function _M:mouseIcon(bx, by)
+	if by < 12 then
+		self.tooltip:displayAtMap(nil, nil, self.w, self.h, "Display talents")
+	elseif by < 24 then
+		self.tooltip:displayAtMap(nil, nil, self.w, self.h, "Display creatures")
+	elseif by < 36 then
+		self.tooltip:displayAtMap(nil, nil, self.w, self.h, "Main menu")
+	end
+end