Skip to content

Only imply recent minion skill use on non-permanent minions #6309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2023
Merged

Only imply recent minion skill use on non-permanent minions #6309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Data/Skills/act_dex.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5346,6 +5346,7 @@ skills["HeraldOfAgony"] = {
baseFlags = {
cast = true,
minion = true,
permanentMinion = true,
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -9320,6 +9321,7 @@ skills["SummonIceGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down
7 changes: 7 additions & 0 deletions src/Data/Skills/act_int.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8410,6 +8410,7 @@ skills["RaiseSpectre"] = {
minion = true,
spectre = true,
duration = true,
permanentMinion = true,
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -8502,6 +8503,7 @@ skills["RaiseZombie"] = {
baseFlags = {
spell = true,
minion = true,
permanentMinion = true,
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -10663,6 +10665,7 @@ skills["SummonBoneGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down Expand Up @@ -10755,6 +10758,7 @@ skills["SummonChaosGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down Expand Up @@ -10853,6 +10857,7 @@ skills["SummonRelic"] = {
baseFlags = {
spell = true,
minion = true,
permanentMinion = true,
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -10939,6 +10944,7 @@ skills["SummonLightningGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down Expand Up @@ -11388,6 +11394,7 @@ skills["Skitterbots"] = {
baseFlags = {
spell = true,
minion = true,
permanentMinion = true,
},
baseMods = {
skill("radius", 30),
Expand Down
3 changes: 3 additions & 0 deletions src/Data/Skills/act_str.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,7 @@ skills["AnimateArmour"] = {
baseFlags = {
spell = true,
minion = true,
permanentMinion = true,
},
qualityStats = {
Default = {
Expand Down Expand Up @@ -7921,6 +7922,7 @@ skills["SummonFireGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down Expand Up @@ -8011,6 +8013,7 @@ skills["SummonRockGolem"] = {
spell = true,
minion = true,
golem = true,
permanentMinion = true,
},
baseMods = {
skill("allowTotemBuff", true),
Expand Down
4 changes: 2 additions & 2 deletions src/Export/Skills/act_dex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ local skills, mod, flag, skill = ...
#mods

#skill HeraldOfAgony
#flags cast minion
#flags cast minion permanentMinion
minionList = {
"HeraldOfAgonySpiderPlated",
},
Expand Down Expand Up @@ -1794,7 +1794,7 @@ local skills, mod, flag, skill = ...
#mods

#skill SummonIceGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedIceGolem",
},
Expand Down
14 changes: 7 additions & 7 deletions src/Export/Skills/act_int.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@ local skills, mod, flag, skill = ...
#mods

#skill RaiseSpectre
#flags spell minion spectre duration
#flags spell minion spectre duration permanentMinion
minionList = {
},
statMap = {
Expand All @@ -1885,7 +1885,7 @@ local skills, mod, flag, skill = ...
#mods

#skill RaiseZombie
#flags spell minion
#flags spell minion permanentMinion
minionList = {
"RaisedZombie",
},
Expand Down Expand Up @@ -2280,7 +2280,7 @@ local skills, mod, flag, skill = ...
#mods

#skill SummonBoneGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedCarrionGolem",
},
Expand All @@ -2300,7 +2300,7 @@ local skills, mod, flag, skill = ...
#mods

#skill SummonChaosGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedChaosGolem",
},
Expand All @@ -2314,7 +2314,7 @@ local skills, mod, flag, skill = ...
#mods

#skill SummonRelic
#flags spell minion
#flags spell minion permanentMinion
minionList = {
"HolyLivingRelic",
},
Expand All @@ -2336,7 +2336,7 @@ local skills, mod, flag, skill = ...
#mods

#skill SummonLightningGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedLightningGolem",
},
Expand Down Expand Up @@ -2403,7 +2403,7 @@ local skills, mod, flag, skill = ...
#mods

#skill Skitterbots
#flags spell minion
#flags spell minion permanentMinion
minionList = {
"SkitterbotCold",
"SkitterbotLightning",
Expand Down
6 changes: 3 additions & 3 deletions src/Export/Skills/act_str.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ local skills, mod, flag, skill = ...
#mods

#skill AnimateArmour
#flags spell minion
#flags spell minion permanentMinion
minionHasItemSet = true,
minionUses = {
["Weapon 1"] = true,
Expand Down Expand Up @@ -1472,7 +1472,7 @@ end,
#mods

#skill SummonFireGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedFlameGolem",
},
Expand All @@ -1486,7 +1486,7 @@ end,
#mods

#skill SummonRockGolem
#flags spell minion golem
#flags spell minion golem permanentMinion
minionList = {
"SummonedStoneGolem",
},
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ local function doActorAttribsConditions(env, actor)
if actor.mainSkill.skillTypes[SkillType.Movement] then
condList["UsedMovementSkillRecently"] = true
end
if actor.mainSkill.skillFlags.minion then
if actor.mainSkill.skillFlags.minion and not actor.mainSkill.skillFlags.permanentMinion then
condList["UsedMinionSkillRecently"] = true
end
if actor.mainSkill.skillTypes[SkillType.Vaal] then
Expand Down