Talents can be set to require confirmation before use

Improved talents display to show if a talent has been set with automatic use or confirmation


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

game/engines/default/engine/Game.lua

@@ -612,3 +612,8 @@ function _M:registerPersistentHook(hook, fct)
 	table.insert(self.__persistent_hooks, {hook=hook, fct=fct})
 	self:bindHook(hook, fct)
 end
+
+-- get a text-compatible texture for a game entity (overload in module)
+function _M:getGenericTextTiles(en)
+	return "" 
+end

game/engines/default/engine/interface/ActorTalents.lua

@@ -94,6 +94,7 @@ function _M:init(t)
 	self.talents_cd = self.talents_cd or {}
 	self.sustain_talents = self.sustain_talents or {}
 	self.talents_auto = self.talents_auto or {}
+	self.talents_confirm_use = self.talents_confirm_use or {}
 	self.talents_learn_vals = {}
 end
 
@@ -111,21 +112,34 @@ function _M:resolveLevelTalents()
 	end
 end
 
---- Make the actor use the talent
-function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent)
+-- Make the actor use the talent
+-- @param id talent ID
+-- @param who talent user
+-- @param force_level talent level(raw) override 
+-- @param ignore_cd do not affect or consider cooldown
+-- @param force_target the target of the talent (override)
+-- @param silent do not display messages about use
+-- @param no_confirm  Never ask confirmation
+function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent, no_confirm)
 	who = who or self
 	local ab = _M.talents_def[id]
 	assert(ab, "trying to cast talent "..tostring(id).." but it is not defined")
 
+	local cancel = false
 	if ab.mode == "activated" and ab.action then
 		if self:isTalentCoolingDown(ab) and not ignore_cd then
 			game.logPlayer(who, "%s is still on cooldown for %d turns.", ab.name:capitalize(), self.talents_cd[ab.id])
 			return
 		end
-		if not self:preUseTalent(ab, silent) then return end
 		local co = coroutine.create(function()
+			if cancel then
+				success = false
+				return false
+			end
+			if not self:preUseTalent(ab, silent) then return end
 			local old_level
 			local old_target
+			
 			if force_level then old_level = who.talents[id]; who.talents[id] = force_level end
 			if force_target then old_target = rawget(who, "getTarget"); who.getTarget = function(a) return force_target.x, force_target.y, not force_target.__no_self and force_target end end
 			self.__talent_running = ab
@@ -136,20 +150,38 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent)
 
 			if not ok then error(ret) end
 
-			if not self:postUseTalent(ab, ret) then return end
+			if not self:postUseTalent(ab, ret, silent) then return end
 
 			-- Everything went ok? then start cooldown if any
 			if not ignore_cd then self:startTalentCooldown(ab) end
 		end)
-		local ok, err = coroutine.resume(co)
-		if not ok and err then print(debug.traceback(co)) error(err) end
+		local success, err
+		if not no_confirm and self:isTalentConfirmable(ab) then
+			local abname = game:getGenericTextTiles(ab)..ab.name
+			require "engine.ui.Dialog":yesnoPopup("Talent Use Confirmation", ("Use %s?"):format(abname),
+			function(quit)
+				if quit ~= false then
+					cancel = true
+				end
+				success, err = coroutine.resume(co)
+			end,
+			"Cancel","Continue")
+		else
+			-- cancel checked in coroutine
+			success, err = coroutine.resume(co)
+		end
+		if not success and err then print(debug.traceback(co)) error(err) end
 	elseif ab.mode == "sustained" and ab.activate and ab.deactivate then
 		if self:isTalentCoolingDown(ab) and not ignore_cd then
 			game.logPlayer(who, "%s is still on cooldown for %d turns.", ab.name:capitalize(), self.talents_cd[ab.id])
 			return
 		end
-		if not self:preUseTalent(ab, silent) then return end
 		local co = coroutine.create(function()
+			if cancel then
+				success = false
+				return false
+			end
+			if not self:preUseTalent(ab, silent) then return end
 			if not self.sustain_talents[id] then
 				local old_level
 				if force_level then old_level = who.talents[id]; who.talents[id] = force_level end
@@ -172,20 +204,36 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent)
 				local ret = ab.deactivate(who, ab, p)
 				if force_level then who.talents[id] = old_level end
 
-				if not self:postUseTalent(ab, ret) then return end
+				if not self:postUseTalent(ab, ret, silent) then return end
 
 				-- Everything went ok? then start cooldown if any
 				if not ignore_cd then self:startTalentCooldown(ab) end
 				self.sustain_talents[id] = nil
 			end
 		end)
-		local ret, err = coroutine.resume(co)
-		if not ret and err then print(debug.traceback(co)) error(err) end
+		local success, err
+		if not no_confirm and self:isTalentConfirmable(ab) then
+			local abname = game:getGenericTextTiles(ab)..ab.name
+			require "engine.ui.Dialog":yesnoPopup("Talent Use Confirmation", ("%s %s?"):
+			format(self:isTalentActive(ab.id) and "Deactivate" or "Activate",abname),
+			function(quit)
+				if quit ~= false then
+					cancel = true
+				end
+				success, err = coroutine.resume(co)
+			end,
+			"Cancel","Continue")
+		else
+			-- cancel checked in coroutine
+			success, err = coroutine.resume(co)
+		end
+		if not success and err then print(debug.traceback(co)) error(err) end
 	else
 		error("Activating non activable or sustainable talent: "..id.." :: "..ab.name.." :: "..ab.mode)
 	end
 	self.changed = true
 	return true
+
 end
 
 --- Replace some markers in a string with info on the talent
@@ -217,7 +265,7 @@ end
 -- @param ab the talent (not the id, the table)
 -- @param ret the return of the talent action
 -- @return true to continue, false to stop
-function _M:postUseTalent(talent, ret)
+function _M:postUseTalent(talent, ret, silent)
 	return true
 end
 
@@ -230,7 +278,7 @@ function _M:forceUseTalent(t, def)
 	if def.ignore_energy then self.energy.value = 10000 end
 
 	if def.ignore_ressources then self:attr("force_talent_ignore_ressources", 1) end
-	local ret = {self:useTalent(t, def.force_who, def.force_level, def.ignore_cd, def.force_target, def.silent)}
+	local ret = {self:useTalent(t, def.force_who, def.force_level, def.ignore_cd, def.force_target, def.silent, true)}
 	if def.ignore_ressources then self:attr("force_talent_ignore_ressources", -1) end
 
 	if def.ignore_energy then
@@ -695,7 +743,6 @@ function _M:setTalentAuto(tid, v)
 	end
 end
 
-
 --- Setup the talent as autocast
 function _M:isTalentAuto(tid)
 	if type(tid) == "table" then tid = tid.id end
@@ -713,6 +760,21 @@ function _M:automaticTalents()
 	end
 end
 
+--- Set the talent confirmation
+function _M:setTalentConfirmable(tid, v)
+	if type(tid) == "table" then tid = tid.id end
+	if v then self.talents_confirm_use[tid] = true
+	else self.talents_confirm_use[tid] = nil
+	end
+end
+
+--- Does the talent require confirmation to use?
+function _M:isTalentConfirmable(tid)
+	if type(tid) == "table" then tid = tid.id end
+	if not self.talents_confirm_use then self.talents_confirm_use = {} end -- For compatibility with older versions, can be removed
+	return self.talents_confirm_use[tid]
+end
+
 --- Show usage dialog
 function _M:useTalents(add_cols)
 	local d = require("engine.dialogs.UseTalents").new(self, add_cols)

game/modules/tome/class/Actor.lua

@@ -3432,7 +3432,7 @@ function _M:preUseTalent(ab, silent, fake)
 
 	if ab.is_inscription and self.inscription_restrictions and not self.inscription_restrictions[ab.type[1]] then
 		if not silent then game.logSeen(self, "%s is unable to use this kind of inscription.", self.name:capitalize()) end
-		return
+		return false
 	end
 
 	-- when using unarmed techniques check for weapons and heavy armor
@@ -3614,11 +3614,12 @@ function _M:preUseTalent(ab, silent, fake)
 
 	if not silent then
 		-- Allow for silent talents
-		if ab.message ~= nil then
-			if ab.message then
-				game.logSeen(self, "%s", self:useTalentMessage(ab))
-			end
-		elseif ab.mode == "sustained" and not self:isTalentActive(ab.id) then
+--		if ab.message ~= nil then
+--			if ab.message then
+--				game.logSeen(self, "PREuse: %s", self:useTalentMessage(ab))
+--			end
+--		else
+		if ab.mode == "sustained" and not self:isTalentActive(ab.id) then
 			game.logSeen(self, "%s activates %s.", self.name:capitalize(), ab.name)
 		elseif ab.mode == "sustained" and self:isTalentActive(ab.id) then
 			game.logSeen(self, "%s deactivates %s.", self.name:capitalize(), ab.name)
@@ -3637,9 +3638,13 @@ end
 -- @param ab the talent (not the id, the table)
 -- @param ret the return of the talent action
 -- @return true to continue, false to stop
-function _M:postUseTalent(ab, ret)
+function _M:postUseTalent(ab, ret, silent)
 	if not ret then return end
 
+	if not silent and ab.message then
+		game.logSeen(self, "POSTuse: %s", self:useTalentMessage(ab))
+	end
+	
 	self.changed = true
 
 	if self.talent_kind_log then 
@@ -4607,3 +4612,4 @@ end
 function _M:transmoGetName()
 	return "Transmogrification Chest"
 end
+

game/modules/tome/class/Game.lua

@@ -2015,3 +2015,18 @@ function _M:countBirthUnlocks()
 	end
 	return nb, max
 end
+
+-- get a text-compatible texture (icon) for an entity
+function _M:getGenericTextTiles(en)
+	local disp = en
+	if not disp then return "" end
+	if not en.getDisplayString then
+		if en.display_entity and en.display_entity.getDisplayString then
+			disp = en.display_entity 
+		else
+			return ""
+		end
+	end
+	disp:getMapObjects(game.uiset.hotkeys_display_icons.tiles, {}, 1)
+	return tostring((disp:getDisplayString() or ""):toTString())
+end

game/modules/tome/data/talents.lua

@@ -77,3 +77,4 @@ load("/data/talents/uber/uber.lua")
 
 print("[TALENTS TACTICS]")
 for k, _ in pairs(tacticals) do print(" * ", k) end
+

game/modules/tome/dialogs/UseTalents.lua

@@ -26,6 +26,30 @@ local TextzoneList = require "engine.ui.TextzoneList"
 local Separator = require "engine.ui.Separator"
 
 module(..., package.seeall, class.inherit(Dialog))
+-- Could use better icons when available
+local confirmMark = require("engine.Entity").new({image="ui/chat-icon.png"})
+local autoMark = require("engine.Entity").new({image = "/ui/hotkeys/mainmenu.png"})
+
+-- generate talent status separately to enable quicker refresh of Dialog
+local function TalentStatus(who,t) 
+	local status = tstring{{"color", "LIGHT_GREEN"}, "Active"} 
+	if who:isTalentCoolingDown(t) then
+		status = tstring{{"color", "LIGHT_RED"}, who:isTalentCoolingDown(t).." turns"}
+	elseif not who:preUseTalent(t, true, true) then
+		status = tstring{{"color", "GREY"}, "Unavailable"}
+	elseif t.mode == "sustained" then
+		status = who:isTalentActive(t.id) and tstring{{"color", "YELLOW"}, "Sustaining"} or tstring{{"color", "LIGHT_GREEN"}, "Sustain"}
+	elseif t.mode == "passive" then
+		status = tstring{{"color", "LIGHT_BLUE"}, "Passive"}
+	end
+	if who:isTalentAuto(t.id) then 
+		status:add(autoMark:getDisplayString())
+	end
+	if who:isTalentConfirmable(t.id) then 
+		status:add(confirmMark:getDisplayString())
+	end
+	return tostring(status) 
+end
 
 function _M:init(actor)
 	self.actor = actor
@@ -34,8 +58,8 @@ function _M:init(actor)
 
 	self.c_tut = Textzone.new{width=math.floor(self.iw / 2 - 10), height=1, auto_height=true, no_color_bleed=true, text=[[
 You can bind a non-passive talent to a hotkey by pressing the corresponding hotkey while selecting a talent or by right-clicking on the talent.
-Check out the keybinding screen in the game menu to bind hotkeys to a key (default is 1-0 plus control or shift).
-Right click or press '@' to configure.
+Check out the keybinding screen in the game menu to bind hotkeys to a key (default is 1-0 plus control, shift, or alt).
+Right click or press '~' to configure talent confirmation and automatic use.
 ]]}
 	self.c_desc = TextzoneList.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, scrollbar=true, no_color_bleed=true}
 
@@ -44,7 +68,9 @@ Right click or press '@' to configure.
 	local cols = {
 		{name="", width={40,"fixed"}, display_prop="char"},
 		{name="Talent", width=80, display_prop="name"},
-		{name="Status", width=20, display_prop="status"},
+		{name="Status", width=20, display_prop=function(item)
+			if item.talent then return TalentStatus(actor, actor:getTalentFromId(item.talent)) else return "" end
+		end},
 		{name="Hotkey", width={75,"fixed"}, display_prop="hotkey"},
 		{name="Mouse Click", width={60,"fixed"}, display_prop=function(item)
 			if item.talent and item.talent == self.actor.auto_shoot_talent then return "LeftClick"
@@ -66,7 +92,7 @@ Right click or press '@' to configure.
 
 	self.key:addCommands{
 		__TEXTINPUT = function(c)
-			if c == '@' then
+			if c == '~' then
 				self:use(self.cur_item, "right")
 			end
 			if self.list and self.list.chars[c] then
@@ -134,14 +160,17 @@ function _M:use(item, button)
 			{name="Bind to middle mouse click (on a target)", what="middle"},
 		}
 
-		--local t = self.actor:getTalentFromId(item.talent)
-		if self.actor:isTalentAuto(t) then table.insert(list, 1, {name="Disable automatic use", what="auto-dis"})
-		else 
-			table.insert(list, 1, {name="Auto-use when enemies are visible and adjacent", what="auto-en-4"})
-			table.insert(list, 1, {name="Auto-use when enemies are visible", what="auto-en-3"})
-			table.insert(list, 1, {name="Auto-use when no enemies are visible", what="auto-en-2"})
-			table.insert(list, 1, {name="Auto-use when available", what="auto-en-1"})
+		if self.actor:isTalentConfirmable(t) then
+			table.insert(list, 1, {name="#YELLOW#Disable talent confirmation", what="unset-confirm"})
+		else
+			table.insert(list, 1, {name=confirmMark:getDisplayString().."Request confirmation before using this talent", what="set-confirm"})
 		end
+		local automode = self.actor:isTalentAuto(t)
+		local ds = "#YELLOW#Disable "
+		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==1 and ds or "").."Auto-use when available", what=(automode==1 and "auto-dis" or "auto-en-1")})
+		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==2 and ds or "").."Auto-use when no enemies are visible", what=(automode==2 and "auto-dis" or "auto-en-2")})
+		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==3 and ds or "").."Auto-use when enemies are visible", what=(automode==3 and "auto-dis" or "auto-en-3")})
+		table.insert(list, 2, {name=autoMark:getDisplayString()..(automode==4 and ds or "").."Auto-use when enemies are visible and adjacent", what=(automode==4 and "auto-dis" or "auto-en-4")})
 
 		for i = 1, 12 * self.actor.nb_hotkey_pages do list[#list+1] = {name="Hotkey "..i, what=i} end
 		Dialog:listPopup("Bind talent: "..item.name:toString(), "How do you want to bind this talent?", list, 400, 500, function(b)
@@ -164,20 +193,31 @@ function _M:use(item, button)
 				for i = 1, 12 * self.actor.nb_hotkey_pages do
 					if self.actor.hotkey[i] and self.actor.hotkey[i][1] == "talent" and self.actor.hotkey[i][2] == item.talent then self.actor.hotkey[i] = nil end
 				end
+			elseif b.what == "set-confirm" then
+				self.actor:setTalentConfirmable(item.talent, true)
+			elseif b.what == "unset-confirm" then
+				self.actor:setTalentConfirmable(item.talent, false)
 			elseif b.what == "auto-en-1" then
+				self.actor:setTalentAuto(item.talent, true, 1)
 				self.actor:checkSetTalentAuto(item.talent, true, 1)
+				--self.actor:setTalentAuto(item.talent, true, automode)
 			elseif b.what == "auto-en-2" then
+				self.actor:setTalentAuto(item.talent, true, 2)
 				self.actor:checkSetTalentAuto(item.talent, true, 2)
 			elseif b.what == "auto-en-3" then
+				self.actor:setTalentAuto(item.talent, true, 3)
 				self.actor:checkSetTalentAuto(item.talent, true, 3)
 			elseif b.what == "auto-en-4" then
+				self.actor:setTalentAuto(item.talent, true, 4)
 				self.actor:checkSetTalentAuto(item.talent, true, 4)
 			elseif b.what == "auto-dis" then
 				self.actor:checkSetTalentAuto(item.talent, false)
 			end
 			self.c_list:drawTree()
+			if b.what ~= "auto-dis" and automode then self.actor:setTalentAuto(item.talent, true, automode) else self.actor:setTalentAuto(item.talent, false) end
 			self.actor.changed = true
 		end)
+		self.c_list:drawTree()
 		return
 	end
 
@@ -250,27 +290,22 @@ function _M:generateList()
 	local actives, sustains, sustained, unavailables, cooldowns, passives = {}, {}, {}, {}, {}, {}
 	local chars = {}
 
-	-- Find all talents of this school
+	-- Generate lists of all talents by category
 	for j, t in pairs(self.actor.talents_def) do
 		if self.actor:knowTalent(t.id) and not (t.hide and t.mode == "passive") then
-			local typename = "talent"
 			local nodes = (t.mode == "sustained" and sustains) or (t.mode =="passive" and passives) or actives
-			local status = tstring{{"color", "LIGHT_GREEN"}, "Active"}
 			if self.actor:isTalentCoolingDown(t) then
 				nodes = cooldowns
-				status = tstring{{"color", "LIGHT_RED"}, self.actor:isTalentCoolingDown(t).." turns"}
 			elseif not self.actor:preUseTalent(t, true, true) then
 				nodes = unavailables
-				status = tstring{{"color", "GREY"}, "Unavailable"}
 			elseif t.mode == "sustained" then
 				if self.actor:isTalentActive(t.id) then nodes = sustained end
-				status = self.actor:isTalentActive(t.id) and tstring{{"color", "YELLOW"}, "Sustaining"} or tstring{{"color", "LIGHT_GREEN"}, "Sustain"}
 			elseif t.mode == "passive" then
 				nodes = passives
-				status = tstring{{"color", "LIGHT_BLUE"}, "Passive"}
 			end
-
-			-- Pregenenerate icon with the Tiles instance that allows images
+			status = TalentStatus(self.actor,t)
+			
+			-- Pregenerate icon with the Tiles instance that allows images
 			if t.display_entity then t.display_entity:getMapObjects(game.uiset.hotkeys_display_icons.tiles, {}, 1) end
 
 			nodes[#nodes+1] = {
@@ -304,7 +339,6 @@ function _M:generateList()
 	for i, node in ipairs(unavailables) do node.char = self:makeKeyChar(letter) chars[node.char] = node letter = letter + 1 end
 	for i, node in ipairs(passives) do node.char = "" end
 
-
 	list = {
 		{ char='', name=('#{bold}#Activable talents#{normal}#'):toTString(), status='', hotkey='', desc="All activable talents you can currently use.", color=function() return colors.simple(colors.LIGHT_GREEN) end, nodes=actives, shown=true },
 		{ char='', name=('#{bold}#Sustainable talents#{normal}#'):toTString(), status='', hotkey='', desc="All sustainable talents you can currently use.", color=function() return colors.simple(colors.LIGHT_GREEN) end, nodes=sustains, shown=true },