Skip to content
Snippets Groups Projects
Commit 0286a864 authored by DarkGod's avatar DarkGod
Browse files

various fixes

parent 1fc4ac81
No related branches found
No related tags found
No related merge requests found
......@@ -221,7 +221,12 @@ function _M:descAttribute(attr)
elseif attr == "INSCRIPTION" then
game.player.__inscription_data_fake = self.inscription_data
local t = self:getTalentFromId("T_"..self.inscription_talent.."_1")
local desc = t.short_info(game.player, t)
local desc = "--"
if t then
local ok
ok, desc = pcall(t.short_info, game.player, t)
if not ok then desc = "--" end
end
game.player.__inscription_data_fake = nil
return ("%s"):format(desc)
end
......@@ -1460,10 +1465,12 @@ function _M:getTextualDesc(compare_with, use_actor)
use_actor.__inscription_data_fake = self.inscription_data
local t = self:getTalentFromId("T_"..self.inscription_talent.."_1")
if t then
local tdesc = use_actor:getTalentFullDescription(t)
desc:add({"color","YELLOW"}, "When inscribed on your body:", {"color", "LAST"}, true)
desc:merge(tdesc)
desc:add(true)
local ok, tdesc = pcall(use_actor.getTalentFullDescription, use_actor, t)
if ok and tdesc then
desc:add({"color","YELLOW"}, "When inscribed on your body:", {"color", "LAST"}, true)
desc:merge(tdesc)
desc:add(true)
end
end
use_actor.__inscription_data_fake = nil
end
......
......@@ -586,7 +586,7 @@ newEntity{
target.talents_cd[t.id] = turns
local tg = {type="hit", range=1}
who:project(tg, target.x, target.y, engine.DamageType.ARCANE, damage)
who:project(tg, target.x, target.y, engine.DamageType.ARCANE, tonumber(util.getval(damage, who, t)) or 0)
game.logSeen(target, "%s's %s has been #ORCHID#burned#LAST#!", target.name:capitalize(), t.name)
end},
......
......@@ -582,8 +582,8 @@ newEntity{
e.wielder.talents_types_mastery = {}
local v = (10 + rng.mbonus(math.ceil(30 * e.material_level / 5), resolvers.current_level, 50)) / 100
e.wielder.talents_types_mastery[tt] = v
e.wielder.talents_types_mastery[tt2] = v
if tt then e.wielder.talents_types_mastery[tt] = v end
if tt2 then e.wielder.talents_types_mastery[tt2] = v end
e.cost = e.cost + v * 60
end),
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment