Lisa Greene / Tales of MajEyal · Commits

Commit a8b298b08acbefbe0daaa43ab6ba1ddaa34b8d64

Authored by Lisa Greene
1 parent 76b58d42
build: skipped

Revert "Check for conflicts between power source and categories for mastery boosting" 

This reverts commit 76b58d42
Inline Side-by-side
Showing 1 changed file with 6 additions and 14 deletions
... ... @@ -100,16 +100,12 @@ newEntity{
100 100 rarity = 6,
101 101 cost = 2,
102 102 wielder = {},
103   - resolvers.genericlast(function(e)
  103 + resolvers.generic(function(e)
104 104 local tts = {}
105 105 local p = game:getPlayer(true)
106 106 for i, def in ipairs(engine.interface.ActorTalents.talents_types_def) do
107   - if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then
108   - if not (e.power_source.antimagic and def.is_spell) or (e.power_source.arcane and def.is_antimagic) then
109   - tts[#tts+1] = def.type
110   - end
111   - end
112   - end
  107 + if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then tts[#tts+1] = def.type end
  108 + end
113 109 local tt = tts[rng.range(1, #tts)]
114 110
115 111 e.wielder.talents_types_mastery = {}
... ... @@ -537,16 +533,12 @@ newEntity{
537 533 greater_ego = 1,
538 534 cost = 2,
539 535 wielder = {},
540   - resolvers.genericlast(function(e)
  536 + resolvers.generic(function(e)
541 537 local tts = {}
542 538 local p = game:getPlayer(true)
543 539 for i, def in ipairs(engine.interface.ActorTalents.talents_types_def) do
544   - if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then
545   - if not (e.power_source.antimagic and def.is_spell) or (e.power_source.arcane and def.is_antimagic) then
546   - tts[#tts+1] = def.type
547   - end
548   - end
549   - end
  540 + if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then tts[#tts+1] = def.type end
  541 + end
550 542 --local tt = tts[rng.range(1, #tts)]
551 543 local tt = rng.tableRemove(tts)
552 544 local tt2 = rng.tableRemove(tts)
... ...