Skip to content

Commit 5b06daa

Browse files
authored
Add support for Sturdy Ally and Tandem Assualt (#1099)
1 parent 4271a3a commit 5b06daa

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/Data/ModCache.lua

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3593,10 +3593,8 @@ c["Cold Exposure you inflict lowers Total Cold Resistance by an extra 5%"]={{[1]
35933593
c["Cold Resistance is unaffected by Area Penalties"]={nil,"Cold Resistance is unaffected by Area Penalties "}
35943594
c["Cold Resistance is unaffected by Area Penalties Fire Resistance is unaffected by Area Penalties"]={nil,"Cold Resistance is unaffected by Area Penalties Fire Resistance is unaffected by Area Penalties "}
35953595
c["Companions deal 12% increased Damage"]={{[1]={[1]={skillType=198,type="SkillType"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="INC",value=12}}}},nil}
3596-
c["Companions gain your Dexterity"]={nil,"Companions gain your Dexterity "}
3597-
c["Companions gain your Dexterity +15 to Dexterity"]={nil,"Companions gain your Dexterity +15 to Dexterity "}
3598-
c["Companions gain your Strength"]={nil,"Companions gain your Strength "}
3599-
c["Companions gain your Strength +15 to Strength"]={nil,"Companions gain your Strength +15 to Strength "}
3596+
c["Companions gain your Dexterity"]={{[1]={flags=0,keywordFlags=0,name="DexterityAddedToCompanions",type="FLAG",value=true}},nil}
3597+
c["Companions gain your Strength"]={{[1]={flags=0,keywordFlags=0,name="StrengthAddedToCompanions",type="FLAG",value=true}},nil}
36003598
c["Companions have +1 to each Defence for every 2 of that Defence you have"]={{}," each Defence for every 2 of that Defence you have "}
36013599
c["Companions have +12% to all Elemental Resistances"]={{[1]={[1]={skillType=198,type="SkillType"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ElementalResist",type="BASE",value=12}}}},nil}
36023600
c["Companions have +30% to Chaos Resistance"]={{[1]={[1]={skillType=198,type="SkillType"},flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ChaosResist",type="BASE",value=30}}}},nil}

src/Modules/CalcPerform.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,12 +921,18 @@ function calcs.perform(env, skipEHP)
921921
if modDB:Flag(nil, "StrengthAddedToMinions") then
922922
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str")), "Player")
923923
end
924+
if modDB:Flag(nil, "StrengthAddedToCompanions") and env.player.mainSkill.skillTypes[SkillType.Companion] then
925+
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str")), "Sturdy Ally")
926+
end
924927
if modDB:Flag(nil, "HalfStrengthAddedToMinions") then
925928
env.minion.modDB:NewMod("Str", "BASE", round(calcLib.val(modDB, "Str") * 0.5), "Player")
926929
end
927930
if modDB:Flag(nil, "DexterityAddedToMinions") then
928931
env.minion.modDB:NewMod("Dex", "BASE", round(calcLib.val(modDB, "Dex")), "Dead can Dance")
929932
end
933+
if modDB:Flag(nil, "DexterityAddedToCompanions") and env.player.mainSkill.skillTypes[SkillType.Companion] then
934+
env.minion.modDB:NewMod("Dex", "BASE", round(calcLib.val(modDB, "Dex")), "Tandem Assault")
935+
end
930936
end
931937
if env.talismanModList then
932938
-- Accounting for "Necromantic Talisman"

src/Modules/ModParser.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4122,6 +4122,8 @@ local specialModList = {
41224122
["minions revive (%d+)%% faster"] = function(num) return { mod("MinionRevivalTime", "INC", -num) } end,
41234123
["your strength is added to your minions"] = { flag("StrengthAddedToMinions") },
41244124
["your dexterity is added to your minions"] = { flag("DexterityAddedToMinions") },
4125+
["companions gain your dexterity"] = { flag("DexterityAddedToCompanions") },
4126+
["companions gain your strength"] = { flag("StrengthAddedToCompanions") },
41254127
["half of your strength is added to your minions"] = { flag("HalfStrengthAddedToMinions") },
41264128
["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,
41274129
["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)