From 309d7b7d16f19f4cd7579c823c80c6a2b71989e8 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Tue, 2 Sep 2025 16:13:47 -0500 Subject: [PATCH 1/3] Minions are Gigantic --- src/Data/ModCache.lua | 2 +- src/Modules/ModParser.lua | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index 93a28b5686..49754aa72a 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -5770,7 +5770,7 @@ c["Your Hits cannot be Evaded by Pinned Enemies"]={nil,"Your Hits cannot be Evad c["Your Life Flask also applies to your Minions"]={nil,"Your Life Flask also applies to your Minions "} c["Your Life Flask also applies to your Minions Minions cannot Die while affected by a Life Flask"]={nil,"Your Life Flask also applies to your Minions Minions cannot Die while affected by a Life Flask "} c["Your Life cannot change while you have Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EternalLife",type="FLAG",value=true}},nil} -c["Your Minions are Gigantic"]={nil,"Your Minions are Gigantic "} +c["Your Minions are Gigantic"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="MORE",value=20}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="MORE",value=20}}}},nil} c["Your Offerings affect you instead of your Minions"]={nil,"Your Offerings affect you instead of your Minions "} c["Your Offerings affect you instead of your Minions Offerings created by Culling Enemies have 1% increased Effect per Power of Culled Enemy"]={nil,"Your Offerings affect you instead of your Minions Offerings created by Culling Enemies have 1% increased Effect per Power of Culled Enemy "} c["Your Offerings can target Enemies in Culling range"]={nil,"Your Offerings can target Enemies in Culling range "} diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 70353de369..b047766156 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4171,6 +4171,10 @@ local specialModList = { ["companions gain your dexterity"] = { flag("DexterityAddedToCompanions") }, ["companions gain your strength"] = { flag("StrengthAddedToCompanions") }, ["half of your strength is added to your minions"] = { flag("HalfStrengthAddedToMinions") }, + ["your minions are gigantic"] = { + mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 20) }), + mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", 20) }), + }, ["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, ["minions created recently have (%d+)%% increased movement speed"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", num) }, { type = "Condition", var = "MinionsCreatedRecently" }) } end, ["minions poison enemies on hit"] = { mod("MinionModifier", "LIST", { mod = mod("PoisonChance", "BASE", 100) }) }, From fecaab9286896c69e593c93e920d99a1ce4eabd0 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Wed, 3 Sep 2025 00:14:25 -0500 Subject: [PATCH 2/3] Fix Hulking Minions --- src/Data/Skills/sup_int.lua | 7 +++---- src/Export/Skills/sup_int.txt | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Data/Skills/sup_int.lua b/src/Data/Skills/sup_int.lua index 59d0ecb3bf..290c387cba 100644 --- a/src/Data/Skills/sup_int.lua +++ b/src/Data/Skills/sup_int.lua @@ -3104,11 +3104,10 @@ skills["SupportHulkingMinionsPlayer"] = { incrementalEffectiveness = 0.054999999701977, statDescriptionScope = "gem_stat_descriptions", statMap = { - ["support_titanblood_minion_damage_+%_final"] = { - mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), - }, - ["support_titanblood_minion_life_+%_final"] = { + ["minions_are_gigantic"] = { mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", nil) }), + mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), + mult = 20, }, }, baseFlags = { diff --git a/src/Export/Skills/sup_int.txt b/src/Export/Skills/sup_int.txt index 1606bd99df..ad553eb050 100644 --- a/src/Export/Skills/sup_int.txt +++ b/src/Export/Skills/sup_int.txt @@ -676,11 +676,10 @@ statMap = { #skill SupportHulkingMinionsPlayer #set SupportHulkingMinionsPlayer statMap = { - ["support_titanblood_minion_damage_+%_final"] = { - mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), - }, - ["support_titanblood_minion_life_+%_final"] = { + ["minions_are_gigantic"] = { mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", nil) }), + mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), + mult = 20, }, }, #mods From 96f7b3b46b035652624ad02126aa441dba26b5c0 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 10 Sep 2025 02:57:28 +1000 Subject: [PATCH 3/3] Implement in CalcPerform to not duplicate effect --- src/Data/ModCache.lua | 2 +- src/Data/SkillStatMap.lua | 3 +++ src/Data/Skills/sup_int.lua | 7 ------- src/Export/Skills/sup_int.txt | 7 ------- src/Modules/CalcPerform.lua | 4 ++++ src/Modules/ModParser.lua | 3 +-- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index 49754aa72a..f7862c333b 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -5770,7 +5770,7 @@ c["Your Hits cannot be Evaded by Pinned Enemies"]={nil,"Your Hits cannot be Evad c["Your Life Flask also applies to your Minions"]={nil,"Your Life Flask also applies to your Minions "} c["Your Life Flask also applies to your Minions Minions cannot Die while affected by a Life Flask"]={nil,"Your Life Flask also applies to your Minions Minions cannot Die while affected by a Life Flask "} c["Your Life cannot change while you have Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EternalLife",type="FLAG",value=true}},nil} -c["Your Minions are Gigantic"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Damage",type="MORE",value=20}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="MORE",value=20}}}},nil} +c["Your Minions are Gigantic"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Gigantic",type="FLAG",value=true}}}},nil} c["Your Offerings affect you instead of your Minions"]={nil,"Your Offerings affect you instead of your Minions "} c["Your Offerings affect you instead of your Minions Offerings created by Culling Enemies have 1% increased Effect per Power of Culled Enemy"]={nil,"Your Offerings affect you instead of your Minions Offerings created by Culling Enemies have 1% increased Effect per Power of Culled Enemy "} c["Your Offerings can target Enemies in Culling range"]={nil,"Your Offerings can target Enemies in Culling range "} diff --git a/src/Data/SkillStatMap.lua b/src/Data/SkillStatMap.lua index 5ad5acdb37..c1d6f15bb9 100644 --- a/src/Data/SkillStatMap.lua +++ b/src/Data/SkillStatMap.lua @@ -2238,6 +2238,9 @@ return { ["minion_block_%"] = { mod("MinionModifier", "LIST", { mod = mod("BlockChance", "BASE", nil) }), }, +["minions_are_gigantic"] = { + mod("MinionModifier", "LIST", { mod = flag("Gigantic") }), +}, ["base_number_of_zombies_allowed"] = { mod("ActiveZombieLimit", "BASE", nil), }, diff --git a/src/Data/Skills/sup_int.lua b/src/Data/Skills/sup_int.lua index 290c387cba..757307c4b5 100644 --- a/src/Data/Skills/sup_int.lua +++ b/src/Data/Skills/sup_int.lua @@ -3103,13 +3103,6 @@ skills["SupportHulkingMinionsPlayer"] = { label = "Hulking Minions", incrementalEffectiveness = 0.054999999701977, statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["minions_are_gigantic"] = { - mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", nil) }), - mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), - mult = 20, - }, - }, baseFlags = { }, stats = { diff --git a/src/Export/Skills/sup_int.txt b/src/Export/Skills/sup_int.txt index ad553eb050..b6e75caae5 100644 --- a/src/Export/Skills/sup_int.txt +++ b/src/Export/Skills/sup_int.txt @@ -675,13 +675,6 @@ statMap = { #skill SupportHulkingMinionsPlayer #set SupportHulkingMinionsPlayer -statMap = { - ["minions_are_gigantic"] = { - mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", nil) }), - mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }), - mult = 20, - }, -}, #mods #skillEnd diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index 8686ff02de..06f343f16b 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -307,6 +307,10 @@ local function doActorAttribsConditions(env, actor) modDB:NewMod("Life", "INC", m_floor(40 * shrineEffectMod), "Massive Shrine") modDB:NewMod("AreaOfEffect", "INC", m_floor(40 * shrineEffectMod), "Massive Shrine") end + if modDB:Flag(nil, "Gigantic") then + modDB:NewMod("Life", "MORE", 20, "Gigantic") + modDB:NewMod("Damage", "MORE", 20, "Gigantic") + end end if env.mode_effective then if env.player.mainSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "FireExposureChance") > 0 or modDB:Sum("BASE", nil, "FireExposureChance") > 0 then diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index b047766156..e1aeb0e255 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4172,8 +4172,7 @@ local specialModList = { ["companions gain your strength"] = { flag("StrengthAddedToCompanions") }, ["half of your strength is added to your minions"] = { flag("HalfStrengthAddedToMinions") }, ["your minions are gigantic"] = { - mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 20) }), - mod("MinionModifier", "LIST", { mod = mod("Life", "MORE", 20) }), + mod("MinionModifier", "LIST", { mod = flag("Gigantic") }), }, ["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, ["minions created recently have (%d+)%% increased movement speed"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", num) }, { type = "Condition", var = "MinionsCreatedRecently" }) } end,