From 3a51fe0b13e98fc44f36f96767f694113258108b Mon Sep 17 00:00:00 2001 From: Hachem_Muche <Hachem_Muche@stanfordalumni.org> Date: Thu, 24 Jul 2014 15:04:14 -0700 Subject: [PATCH] resolve talent conflict --- game/modules/tome/data/talents.lua | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/game/modules/tome/data/talents.lua b/game/modules/tome/data/talents.lua index 35ad8a262f..cd5d58f8e6 100644 --- a/game/modules/tome/data/talents.lua +++ b/game/modules/tome/data/talents.lua @@ -33,17 +33,7 @@ Talents.newTalent = function(self, t) if tt.is_unarmed then t.is_unarmed = true end if tt.autolearn_mindslayer then t.autolearn_mindslayer = true end if tt.speed and not t.speed then t.speed = tt.speed end ---[[ - assert(engine.interface.ActorTalents.talents_types_def[t.type[1]], "No talent category "..tostring(t.type[1]).." for talent "..t.name) - if engine.interface.ActorTalents.talents_types_def[t.type[1]].generic then t.generic = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].no_silence then t.no_silence = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_spell then t.is_spell = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_mind then t.is_mind = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_nature then t.is_nature = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_antimagic then t.is_antimagic = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].is_unarmed then t.is_unarmed = true end - if engine.interface.ActorTalents.talents_types_def[t.type[1]].autolearn_mindslayer then t.autolearn_mindslayer = true end ---]] + if t.tactical then local tacts = {} for tact, val in pairs(t.tactical) do -- GitLab