From f54efed10e8dffd6c8c2d1a94d404c913582aec7 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Fri, 23 May 2014 12:07:12 +0200
Subject: [PATCH] fix missing talent type
---
game/modules/tome/class/Object.lua | 20 ++++++++++---------
.../objects/world-artifacts-maj-eyal.lua | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 7eca4a63a2..4873cec930 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -1046,17 +1046,19 @@ function _M:getTextualDesc(compare_with, use_actor)
desc:add(("Talent master%s: "):format(any_mastery > 1 and "ies" or "y"))
for ttn, ttid in pairs(masteries) do
local tt = Talents.talents_types_def[ttn]
- local cat = tt.type:gsub("/.*", "")
- local name = cat:capitalize().." / "..tt.name:capitalize()
- local diff = (ttid[2] or 0) - (ttid[1] or 0)
- if diff ~= 0 then
- if ttid[1] then
- desc:add(("%+.2f"):format(ttid[2] or 0), diff < 0 and {"color","RED"} or {"color","LIGHT_GREEN"}, ("(%+.2f) "):format(diff), {"color","LAST"}, ("%s "):format(name))
+ if tt then
+ local cat = tt.type:gsub("/.*", "")
+ local name = cat:capitalize().." / "..tt.name:capitalize()
+ local diff = (ttid[2] or 0) - (ttid[1] or 0)
+ if diff ~= 0 then
+ if ttid[1] then
+ desc:add(("%+.2f"):format(ttid[2] or 0), diff < 0 and {"color","RED"} or {"color","LIGHT_GREEN"}, ("(%+.2f) "):format(diff), {"color","LAST"}, ("%s "):format(name))
+ else
+ desc:add({"color","LIGHT_GREEN"}, ("%+.2f"):format(ttid[2] or 0), {"color","LAST"}, (" %s "):format(name))
+ end
else
- desc:add({"color","LIGHT_GREEN"}, ("%+.2f"):format(ttid[2] or 0), {"color","LAST"}, (" %s "):format(name))
+ desc:add({"color","WHITE"}, ("%+.2f(-) %s "):format(ttid[2] or ttid[1], name), {"color","LAST"})
end
- else
- desc:add({"color","WHITE"}, ("%+.2f(-) %s "):format(ttid[2] or ttid[1], name), {"color","LAST"})
end
end
desc:add(true)
diff --git a/game/modules/tome/data/general/objects/world-artifacts-maj-eyal.lua b/game/modules/tome/data/general/objects/world-artifacts-maj-eyal.lua
index fa250f37c5..cbe203b188 100644
--- a/game/modules/tome/data/general/objects/world-artifacts-maj-eyal.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts-maj-eyal.lua
@@ -511,7 +511,7 @@ Finally The Scorpion was defeated by the alchemist Nessylia, who went to face th
combat_armor = 4,
combat_def = 8,
disarm_immune = 0.4,
- talents_types_mastery = { ["psionic/grip"] = 0.2, ["technique/grappling"] = 0.2},
+ talents_types_mastery = { ["technique/grappling"] = 0.2},
combat = {
dam = 24,
apr = 10,
--
GitLab