Skip to content
Snippets Groups Projects
Commit a8b298b0 authored by Lisa Greene's avatar Lisa Greene
Browse files

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

This reverts commit 76b58d42
parent 76b58d42
No related branches found
No related tags found
2 merge requests!543Summoner Tweaks,!539Summoner Tweaks
......@@ -100,16 +100,12 @@ newEntity{
rarity = 6,
cost = 2,
wielder = {},
resolvers.genericlast(function(e)
resolvers.generic(function(e)
local tts = {}
local p = game:getPlayer(true)
for i, def in ipairs(engine.interface.ActorTalents.talents_types_def) do
if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then
if not (e.power_source.antimagic and def.is_spell) or (e.power_source.arcane and def.is_antimagic) then
tts[#tts+1] = def.type
end
end
end
if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then tts[#tts+1] = def.type end
end
local tt = tts[rng.range(1, #tts)]
e.wielder.talents_types_mastery = {}
......@@ -537,16 +533,12 @@ newEntity{
greater_ego = 1,
cost = 2,
wielder = {},
resolvers.genericlast(function(e)
resolvers.generic(function(e)
local tts = {}
local p = game:getPlayer(true)
for i, def in ipairs(engine.interface.ActorTalents.talents_types_def) do
if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then
if not (e.power_source.antimagic and def.is_spell) or (e.power_source.arcane and def.is_antimagic) then
tts[#tts+1] = def.type
end
end
end
if p and def.allow_random and p:knowTalentType(def.type) or p:knowTalentType(def.type) == false then tts[#tts+1] = def.type end
end
--local tt = tts[rng.range(1, #tts)]
local tt = rng.tableRemove(tts)
local tt2 = rng.tableRemove(tts)
......
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