Skip to content

Commit 1c366cf

Browse files
LocalIdentityLocalIdentity
andauthored
Fix The Baron and Rotting Might not stacking correctly (#8555)
The half strength mod is meant to stack when using both the ascendancy and the helmet Co-authored-by: LocalIdentity <[email protected]>
1 parent dcbb5f2 commit 1c366cf

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/Data/ModCache.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8609,7 +8609,7 @@ c["Guard Skills have 20% increased Cooldown Recovery Rate"]={{[1]={[1]={skillTyp
86098609
c["Guard Skills have 25% increased Duration"]={{[1]={[1]={skillType=89,type="SkillType"},flags=0,keywordFlags=0,name="Duration",type="INC",value=25}},nil}
86108610
c["Guard Skills have 40% increased Duration"]={{[1]={[1]={skillType=89,type="SkillType"},flags=0,keywordFlags=0,name="Duration",type="INC",value=40}},nil}
86118611
c["Guard Skills have 6% increased Duration"]={{[1]={[1]={skillType=89,type="SkillType"},flags=0,keywordFlags=0,name="Duration",type="INC",value=6}},nil}
8612-
c["Half of your Strength is added to your Minions"]={{[1]={flags=0,keywordFlags=0,name="HalfStrengthAddedToMinions",type="FLAG",value=true}},nil}
8612+
c["Half of your Strength is added to your Minions"]={{[1]={flags=0,keywordFlags=0,name="StrengthAddedToMinions",type="BASE",value=50}},nil}
86138613
c["Has 1 Abyssal Socket"]={{[1]={flags=0,keywordFlags=0,name="AbyssalSocketCount",type="BASE",value=1}},nil}
86148614
c["Has 1 Socket"]={{[1]={flags=0,keywordFlags=0,name="SocketCount",type="BASE",value=1}},nil}
86158615
c["Has 2 Abyssal Sockets"]={{[1]={flags=0,keywordFlags=0,name="AbyssalSocketCount",type="BASE",value=2}},nil}

src/Modules/CalcPerform.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,11 +1113,8 @@ function calcs.perform(env, skipEHP)
11131113
end
11141114
end
11151115
end
1116-
if modDB:Flag(nil, "StrengthAddedToMinions") then
1117-
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str")), "Player")
1118-
end
1119-
if modDB:Flag(nil, "HalfStrengthAddedToMinions") then
1120-
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str") * 0.5), "Player")
1116+
if modDB:Sum("BASE", nil, "StrengthAddedToMinions") > 0 then
1117+
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str") * modDB:Sum("BASE", nil, "StrengthAddedToMinions") / 100), "Player")
11211118
end
11221119
end
11231120
if env.aegisModList then

src/Modules/ModParser.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3849,8 +3849,8 @@ local specialModList = {
38493849
["totems gain %+(%d+)%% to all elemental resistances"] = function(num) return { mod("TotemElementalResist", "BASE", num) } end,
38503850
["rejuvenation totem also grants mana regeneration equal to 15%% of its life regeneration"] = { flag("Condition:RejuvenationTotemManaRegen") },
38513851
-- Minions
3852-
["your strength is added to your minions"] = { flag("StrengthAddedToMinions") },
3853-
["half of your strength is added to your minions"] = { flag("HalfStrengthAddedToMinions") },
3852+
["your strength is added to your minions"] = { mod("StrengthAddedToMinions", "BASE", 100) },
3853+
["half of your strength is added to your minions"] = { mod("StrengthAddedToMinions", "BASE", 50) },
38543854
["minions' accuracy rating is equal to yours"] = { flag("MinionAccuracyEqualsAccuracy") },
38553855
["minions created recently have (%d+)%% increased attack and cast speed"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("Speed", "INC", num) }, { type = "Condition", var = "MinionsCreatedRecently" }) } end,
38563856
["minions created recently have (%d+)%% increased movement speed"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", num) }, { type = "Condition", var = "MinionsCreatedRecently" }) } end,

0 commit comments

Comments
 (0)