From b74fa2910d73c25bbe61fd60c3c118c3eaf560f7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 15 Nov 2011 13:52:04 +0000
Subject: [PATCH] Inspect Creature will also show talents
git-svn-id: http://svn.net-core.org/repos/t-engine4@4650 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Player.lua | 2 +
.../modules/tome/data/general/npcs/feline.lua | 1 +
.../tome/data/talents/cursed/cursed-aura.lua | 2 +-
.../talents/techniques/combat-training.lua | 2 +-
game/modules/tome/dialogs/CharacterSheet.lua | 49 ++++++++++++++++---
5 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 828e9a411c..bb1a27b766 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -79,6 +79,8 @@ function _M:init(t, no_default)
t.rank = t.rank or 3
t.old_life = 0
+
+ t.money_value_multiplier = 1 -- changes amounts in gold piles and such
mod.class.Actor.init(self, t, no_default)
engine.interface.PlayerHotkeys.init(self, t)
diff --git a/game/modules/tome/data/general/npcs/feline.lua b/game/modules/tome/data/general/npcs/feline.lua
index 4e215e7857..ecdec4d5c3 100644
--- a/game/modules/tome/data/general/npcs/feline.lua
+++ b/game/modules/tome/data/general/npcs/feline.lua
@@ -37,6 +37,7 @@ newEntity{
newEntity{ base = "BASE_NPC_CAT",
name = "snow cat", color=colors.GRAY,
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/animal_feline_snow_cat.png", display_h=2, display_y=-1}}},
desc = [[A large cat with a grey fur matted with black.]],
level_range = {3, nil}, exp_worth = 1,
rarity = 4,
diff --git a/game/modules/tome/data/talents/cursed/cursed-aura.lua b/game/modules/tome/data/talents/cursed/cursed-aura.lua
index b0e267e125..e4d187de20 100644
--- a/game/modules/tome/data/talents/cursed/cursed-aura.lua
+++ b/game/modules/tome/data/talents/cursed/cursed-aura.lua
@@ -137,7 +137,7 @@ newTalent{
if choose then
Dialog:yesnoLongPopup(
"Cursed Fate",
- ("The %s lying nearby catches your attention. What draws you to it is not the thing itself, but something burning inside you. You feel contempt for it and all worldly things. This feeling is not new but the power of it overwhelms you. You reach out to touch the object, to curse it, to defile it. And you notice it begin to change. The colors of it begin to fade and are replaced with an insatiable hate. For a moment you hesistate..."):format(item.name),
+ ("The %s lying nearby catches your attention. What draws you to it is not the thing itself, but something burning inside you. You feel contempt for it and all worldly things. This feeling is not new but the power of it overwhelms you. You reach out to touch the object, to curse it, to defile it. And you notice it begin to change. The colors of it begin to fade and are replaced with an insatiable hate. For a moment you hesistate. You know you must choose to resist this manifestation of your curse now and forever, or fall further into your madness."):format(item.name),
300,
function(ret)
if ret then
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index 7e1cab393b..f078a66a7b 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -65,7 +65,7 @@ newTalent{
local armor = t.getArmor(self, t)
local criticalreduction = t.getCriticalChanceReduction(self, t)
local classrestriction = ""
- if self.descriptor.subclass == "Brawler" then
+ if self.descriptor and self.descriptor.subclass == "Brawler" then
classrestriction = "(Note that brawlers will be unable to perform many of their talents in massive armour.)"
end
if self:knowTalent(self.T_STEALTH) then
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index e7d7f4f6b8..4526c7181c 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -44,6 +44,7 @@ function _M:init(actor)
self.c_general = Tab.new{title="General", default=true, fct=function() end, on_change=function(s) if s then self:switchTo("general") end end}
self.c_attack = Tab.new{title="Attack", default=false, fct=function() end, on_change=function(s) if s then self:switchTo("attack") end end}
self.c_defence = Tab.new{title="Defense", default=false, fct=function() end, on_change=function(s) if s then self:switchTo("defence") end end}
+ self.c_talents = Tab.new{title="Talents", default=false, fct=function() end, on_change=function(s) if s then self:switchTo("talents") end end}
local tw, th = self.font_bold:size(self.title)
@@ -86,6 +87,7 @@ Mouse: Hover over stat for info
{left=15, top=self.c_tut.h, ui=self.c_general},
{left=15+self.c_general.w, top=self.c_tut.h, ui=self.c_attack},
{left=15+self.c_general.w+self.c_attack.w, top=self.c_tut.h, ui=self.c_defence},
+ {left=15+self.c_general.w+self.c_attack.w+self.c_defence.w, top=self.c_tut.h, ui=self.c_talents},
{left=0, top=self.c_tut.h + self.c_general.h, ui=self.vs},
{left=0, top=self.c_tut.h + self.c_general.h + 5 + self.vs.h, ui=self.c_desc},
@@ -104,9 +106,10 @@ end
function _M:switchTo(kind)
self:drawDialog(kind, _M.cs_player_dup)
- if kind == "general" then self.c_attack.selected = false self.c_defence.selected = false
- elseif kind == "attack" then self.c_general.selected = false self.c_defence.selected = false
- elseif kind == "defence" then self.c_attack.selected = false self.c_general.selected = false
+ if kind == "general" then self.c_attack.selected = false self.c_defence.selected = false self.c_talents.selected = false
+ elseif kind == "attack" then self.c_general.selected = false self.c_defence.selected = false self.c_talents.selected = false
+ elseif kind == "defence" then self.c_attack.selected = false self.c_general.selected = false self.c_talents.selected = false
+ elseif kind == "talents" then self.c_attack.selected = false self.c_general.selected = false self.c_defence.selected = false
end
self:updateKeys()
end
@@ -131,9 +134,11 @@ function _M:updateKeys()
end
function _M:tabTabs()
- if self.c_general.selected == true then self.c_attack:select() elseif
- self.c_attack.selected == true then self.c_defence:select() elseif
- self.c_defence.selected == true then self.c_general:select() end
+ if self.c_general.selected == true then self.c_attack:select()
+ elseif self.c_attack.selected == true then self.c_defence:select()
+ elseif self.c_defence.selected == true then self.c_talents:select()
+ elseif self.c_talents.selected == true then self.c_general:select()
+ end
end
function _M:mouseZones(t, no_new)
@@ -853,6 +858,38 @@ function _M:drawDialog(kind, actor_to_compare)
end
--player.combat_mentalresist
+
+ elseif kind=="talents" then
+ h = 0
+ w = 0
+
+ local list = {}
+ for j, t in pairs(player.talents_def) do
+ if player:knowTalent(t.id) and not t.hide then
+-- local typename = "talent"
+-- 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 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"}
+-- end
+ local lvl = player:getTalentLevelRaw(t)
+ list[#list+1] = {
+ name = ("%s (%d)"):format(t.name, lvl),
+ desc = player:getTalentFullDescription(t):toString(),
+ }
+ end
+ end
+
+ table.sort(list, function(a,b) return a.name < b.name end)
+
+ for i, t in ipairs(list) do
+ self:mouseTooltip(t.desc, s:drawColorStringBlended(self.font, ("#LIGHT_GREEN#%s"):format(t.name), w, h, 255, 255, 255, true)) h = h + self.font_h
+
+ if h + self.font_h >= self.c_desc.h then h = 0 w = w + self.c_desc.w / 6 end
+ end
end
self.c_desc:generate()
--
GitLab