fix

TalentsDisplay testing


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

game/engine/Actor.lua

@@ -8,13 +8,14 @@ module(..., package.seeall, class.inherit(Entity))
 function _M:init(t)
 	t = t or {}
 
-	self.name = t.name or "unknown npc"
+	self.name = t.name or "unknown actor"
 	self.level = t.level or 1
 	self.sight = t.sight or 20
 	self.energy = t.energy or { value=0, mod=1 }
 	self.energy.value = self.energy.value or 0
 	self.energy.mod = self.energy.mod or 0
 	self.faction = t.faction or "enemies"
+	self.changed = true
 	Entity.init(self, t)
 end
 
@@ -36,9 +37,9 @@ end
 
 function _M:canMove(x, y, terrain_only)
 	if terrain_only then
-		return game.level.map:checkEntity(i, j, Map.TERRAIN, "block_move")
+		return game.level.map:checkEntity(x, y, Map.TERRAIN, "block_move")
 	else
-		return game.level.map:checkAllEntities(i, j, "block_move")
+		return game.level.map:checkAllEntities(x, y, "block_move")
 	end
 end
 

game/engine/ai/simple.lua

@@ -21,7 +21,7 @@ newAI("target_simple", function(self)
 	self.ai_target.actor = nil
 	core.fov.calc_circle(self.x, self.y, self.sight, function(self, lx, ly)
 		if game.level.map:checkEntity(lx, ly, Map.TERRAIN, "block_sight") then return true end
-		if not self:canMove(lx, ly, true) then return true end
+		if not self:canMove(lx, ly, true) then return end
 
 		-- get and test the actor, if we are neutral or friendly, ignore it
 		local act = game.level.map(lx, ly, Map.ACTOR)

game/engine/interface/ActorTalents.lua

@@ -135,6 +135,7 @@ function _M:learnTalent(t_id)
 	if not ok and err then return nil, err end
 
 	self.talents[t_id] = true
+	self.changed = true
 	return true
 end
 
@@ -143,6 +144,7 @@ end
 -- @return true if the talent was unlearnt, nil and an error message otherwise
 function _M:unlearnTalent(t_id)
 	self.talents[t_id] = nil
+	self.changed = true
 	return true
 end
 
@@ -225,6 +227,7 @@ end
 -- @return true if the talent was learnt, nil and an error message otherwise
 function _M:learnTalentType(tt)
 	self.talents_types[tt] = true
+	self.changed = true
 	return true
 end
 
@@ -233,6 +236,7 @@ end
 -- @return true if the talent was unlearnt, nil and an error message otherwise
 function _M:unlearnTalentType(tt)
 	self.talents_types[tt] = nil
+	self.changed = true
 	return true
 end
 
@@ -241,18 +245,20 @@ end
 function _M:startTalentCooldown(t)
 	if not t.cooldown then return end
 	self.talents_cd[t.id] = t.cooldown
+	self.changed = true
 end
 
 --- Is talent in cooldown?
 function _M:isTalentCoolingDown(t)
 	if not t.cooldown then return false end
-	if self.talents_cd[t.id] and self.talents_cd[t.id] > 0 then return true else return false end
+	if self.talents_cd[t.id] and self.talents_cd[t.id] > 0 then return self.talents_cd[t.id] else return false end
 end
 
 --- Cooldown all talents by one
 -- This should be called in your actors "act()" method
 function _M:cooldownTalents()
 	for tid, c in pairs(self.talents_cd) do
+		self.changed = true
 		self.talents_cd[tid] = self.talents_cd[tid] - 1
 		if self.talents_cd[tid] == 0 then
 			self.talents_cd[tid] = nil

game/modules/tome/class/Game.lua

@@ -18,6 +18,7 @@ local Player = require "mod.class.Player"
 local NPC = require "mod.class.NPC"
 
 local PlayerDisplay = require "mod.class.PlayerDisplay"
+local TalentsDisplay = require "mod.class.TalentsDisplay"
 
 local LogDisplay = require "engine.LogDisplay"
 local DebugConsole = require "engine.DebugConsole"
@@ -58,8 +59,9 @@ function _M:run()
 	-- Actor AIs
 	ActorAI:loadDefinition("/engine/ai/")
 
-	self.log = LogDisplay.new(0, self.h * 0.80, self.w * 0.5, self.h * 0.20, nil, nil, nil, {255,255,255}, {30,30,30})
+	self.log = LogDisplay.new(0, self.h * 0.8, self.w * 0.5, self.h * 0.2, nil, nil, nil, {255,255,255}, {30,30,30})
 	self.player_display = PlayerDisplay.new(0, 0, self.w * 0.2, self.h * 0.8, {30,30,0})
+	self.talents_display = TalentsDisplay.new(self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, {30,30,0})
 	self.calendar = Calendar.new("/data/calendar_rivendell.lua", "Today is the %s %s of the %s year of the Fourth Age of Middle-earth.\nThe time is %02d:%02d.", 122)
 	self.tooltip = Tooltip.new(nil, nil, {255,255,255}, {30,30,30})
 	self.flyers = FlyingText.new()
@@ -150,6 +152,7 @@ end
 function _M:display()
 	self.log:display():toScreen(self.log.display_x, self.log.display_y)
 	self.player_display:display():toScreen(self.player_display.display_x, self.player_display.display_y)
+	self.talents_display:display():toScreen(self.talents_display.display_x, self.talents_display.display_y)
 
 	if self.level and self.level.map then
 		-- Display the map and compute FOV for the player if needed
@@ -358,7 +361,6 @@ function _M:setupCommands()
 		[{"_KP3","ctrl","shift"}] = function() self.target.target.entity=nil self.target.target.x = self.target.target.x + 1 self.target.target.y = self.target.target.y + 1 end,
 		[{"_KP7","ctrl","shift"}] = function() self.target.target.entity=nil self.target.target.x = self.target.target.x - 1 self.target.target.y = self.target.target.y - 1 end,
 		[{"_KP9","ctrl","shift"}] = function() self.target.target.entity=nil self.target.target.x = self.target.target.x + 1 self.target.target.y = self.target.target.y - 1 end,
-
 		[{"_LEFT","ctrl"}] = function() self.target:scan(4) end,
 		[{"_RIGHT","ctrl"}] = function() self.target:scan(6) end,
 		[{"_UP","ctrl"}] = function() self.target:scan(8) end,
@@ -389,7 +391,7 @@ function _M:setupMouse()
 	local derivx, derivy = 0, 0
 
 	self.mouse:registerZone(Map.display_x, Map.display_y, Map.viewport.width, Map.viewport.height, function(button, mx, my, xrel, yrel)
-		-- Compute map coordonates
+		-- Target stuff
 		if button == "right" then
 			local tmx, tmy = self.level.map:getMouseTile(mx, my)
 
@@ -407,6 +409,7 @@ function _M:setupMouse()
 			else
 				self:targetMode(true, true)
 			end
+		-- Move map around
 		elseif button == "left" and xrel and yrel then
 			derivx = derivx + xrel
 			derivy = derivy + yrel
@@ -427,6 +430,7 @@ function _M:setupMouse()
 			end
 		end
 	end)
+	-- Scroll message log
 	self.mouse:registerZone(self.log.display_x, self.log.display_y, self.w, self.h, function(button)
 		if button == "wheelup" then self.log:scrollUp(1) end
 		if button == "wheeldown" then self.log:scrollUp(-1) end
@@ -435,8 +439,6 @@ end
 
 --- Ask if we realy want to close, if so, save the game first
 function _M:onQuit()
-	-- HACK for quick test
---	os.exit()
 	if not self.quit_dialog then
 		self.quit_dialog = QuitDialog.new()
 		self:registerDialog(self.quit_dialog)

game/modules/tome/class/TalentsDisplay.lua

+require "engine.class"
+
+module(..., package.seeall, class.make)
+
+function _M:init(x, y, w, h, bgcolor)
+	self.display_x = x
+	self.display_y = y
+	self.w, self.h = w, h
+	self.surface = core.display.newSurface(w, h)
+	self.bgcolor = bgcolor
+	self.font = core.display.newFont("/data/font/VeraMono.ttf", 8)
+	self.font_h = self.font:lineSkip()
+end
+
+-- Displays the talents, keybinds & cooldowns
+-- This could use some optimisation, to not redraw everything every time
+function _M:display()
+	local a = game.player
+	if not a.changed then return self.surface end
+	a.changed = false
+
+	local talents = {a.T_MANATHRUST, a.T_FIREFLASH, a.T_NOXIOUS_CLOUD, a.T_BLINK}
+
+	self.surface:erase(self.bgcolor[1], self.bgcolor[2], self.bgcolor[3])
+
+	for i, tid in ipairs(talents) do
+		local t = a:getTalentFromId(tid)
+		local s
+		if a:isTalentCoolingDown(t) then
+			local txt = ("%s (%d)"):format(t.name, a:isTalentCoolingDown(t))
+			local w, h = self.font:size(txt)
+			s = core.display.newSurface(w + 4, h + 4)
+			s:erase(40, 40, 40)
+
+			s:alpha(128)
+			s:drawString(self.font, txt, 2, 2, 255, 0, 0)
+		else
+			local w, h = self.font:size(t.name)
+			s = core.display.newSurface(w + 4, h + 4)
+			s:erase(40, 40, 40)
+
+			s:alpha(255)
+			s:drawString(self.font, t.name, 2, 2, 0, 255, 0)
+		end
+
+		self.surface:merge(s, 0, (i-1) * 20)
+	end
+
+	return self.surface
+end