Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Data/Skills/sup_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5194,9 +5194,6 @@ skills["SupportSummonPhantasm"] = {
addSkillTypes = { SkillType.CreatesMinion, SkillType.MinionsCanExplode, },
excludeSkillTypes = { SkillType.MinionsPersistWhenSkillRemoved, },
statDescriptionScope = "gem_stat_descriptions",
addFlags = {
minion = true,
},
addMinionList = {
"SummonedPhantasm"
},
Expand Down
3 changes: 0 additions & 3 deletions src/Export/Skills/sup_int.txt
Original file line number Diff line number Diff line change
Expand Up @@ -688,9 +688,6 @@ local skills, mod, flag, skill = ...
#mods

#skill SupportSummonPhantasm
addFlags = {
minion = true,
},
addMinionList = {
"SummonedPhantasm"
},
Expand Down
4 changes: 3 additions & 1 deletion src/Modules/CalcActiveSkill.lua
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)

-- Create minion
local minionList, isSpectre
local minionSupportLevel = { }
if activeGrantedEffect.minionList then
if activeGrantedEffect.minionList[1] then
minionList = copyTable(activeGrantedEffect.minionList)
Expand All @@ -629,6 +630,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
if skillEffect.grantedEffect.support and skillEffect.grantedEffect.addMinionList then
for _, minionType in ipairs(skillEffect.grantedEffect.addMinionList) do
t_insert(minionList, minionType)
minionSupportLevel[minionType] = skillEffect.grantedEffect.levels[skillEffect.level].levelRequirement
end
end
end
Expand All @@ -654,7 +656,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
minion.minionData = env.data.minions[minionType]
minion.level = activeSkill.skillData.minionLevelIsEnemyLevel and env.enemyLevel or
activeSkill.skillData.minionLevelIsPlayerLevel and (m_min(env.build and env.build.characterLevel or activeSkill.skillData.minionLevel or activeEffect.grantedEffectLevel.levelRequirement, activeSkill.skillData.minionLevelIsPlayerLevel)) or
activeSkill.skillData.minionLevel or activeEffect.grantedEffectLevel.levelRequirement
minionSupportLevel[minion.type] or activeSkill.skillData.minionLevel or activeEffect.grantedEffectLevel.levelRequirement
-- fix minion level between 1 and 100
minion.level = m_min(m_max(minion.level,1),100)
minion.itemList = { }
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ function calcs.offence(env, actor, activeSkill)
runSkillFunc("preSkillTypeFunc")

-- Calculate skill type stats
if skillFlags.minion then
if activeSkill.minion then
if activeSkill.minion and activeSkill.minion.minionData.limit then
output.ActiveMinionLimit = m_floor(env.modDB:Override(nil, activeSkill.minion.minionData.limit) or calcLib.val(skillModList, activeSkill.minion.minionData.limit, skillCfg))
end
Expand Down Expand Up @@ -3649,7 +3649,7 @@ function calcs.offence(env, actor, activeSkill)
end
end

if skillFlags.minion then
if activeSkill.minion then
skillData.summonSpeed = output.SummonedMinionsPerCast * (output.HitSpeed or output.Speed) * skillData.dpsMultiplier
end

Expand Down