Add support for more int support gems and curse delay (#169)

* Add support for Mana Flare and make current mana config generic.

* Add support for Minion Instability

* Add support for Minion Pact

* Add support for curse delay

Author: PJacek

src/Data/ModCache.lua

@@ -575,7 +575,7 @@ c["10% chance to inflict Bleeding on Critical Hit with Attacks"]={{[1]={[1]={typ
 c["10% chance to inflict Bleeding on Hit"]={{[1]={flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=10}},nil}
 c["10% chance to refresh Ignite Duration on Critical Hit"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="EnemyIgniteDuration",type="BASE",value=10}}," to refresh  "}
 c["10% chance when a Charm is used to use another Charm without consuming Charges"]={{[1]={flags=0,keywordFlags=0,name="FlaskCharges",type="BASE",value=10}}," when a Charm is used to use another Charm without consuming  "}
-c["10% faster Curse Activation"]={{}," Curse Activation "}
+c["10% faster Curse Activation"]={{[1]={flags=0,keywordFlags=0,name="CurseFrequency",type="INC",value=10}},nil}
 c["10% increased Accuracy Rating"]={{[1]={flags=0,keywordFlags=0,name="Accuracy",type="INC",value=10}},nil}
 c["10% increased Accuracy Rating while Dual Wielding"]={{[1]={[1]={type="Condition",var="DualWielding"},flags=0,keywordFlags=0,name="Accuracy",type="INC",value=10}},nil}
 c["10% increased Accuracy Rating with Bows"]={{[1]={flags=131076,keywordFlags=0,name="Accuracy",type="INC",value=10}},nil}
@@ -1616,8 +1616,7 @@ c["4.6 Life Regeneration per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRe
 c["40% chance to Avoid Chaos Damage from Hits"]={{[1]={flags=0,keywordFlags=0,name="ChaosDamage",type="BASE",value=40}}," to Avoid  from Hits "}
 c["40% chance to Avoid Chaos Damage from Hits Enemies in your Presence are Intimidated"]={{[1]={flags=0,keywordFlags=0,name="ChaosDamage",type="BASE",value=40}}," to Avoid  from Hits Enemies in your Presence are Intimidated "}
 c["40% chance to Avoid Physical Damage from Hits"]={{[1]={flags=0,keywordFlags=0,name="AvoidPhysicalDamageChance",type="BASE",value=40}},nil}
-c["40% faster Curse Activation"]={{}," Curse Activation "}
-c["40% faster Curse Activation Your Curses have 20% increased Effect if 50% of Curse Duration expired"]={{[1]={[1]={actor="enemy",threshold=50,type="MultiplierThreshold",var="CurseExpired"},flags=0,keywordFlags=0,name="LocalEffect",type="INC",value=40}}," Curse Activation Your Curses have 20% increased   "}
+c["40% faster Curse Activation"]={{[1]={flags=0,keywordFlags=0,name="CurseFrequency",type="INC",value=40}},nil}
 c["40% faster start of Energy Shield Recharge"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRechargeFaster",type="INC",value=40}},nil}
 c["40% increased Accuracy Rating at Close Range"]={{[1]={[1]={type="Condition",var="AtCloseRange"},flags=0,keywordFlags=0,name="AccuracyVsEnemy",type="INC",value=40}},nil}
 c["40% increased Aftershock Area of Effect"]={{[1]={flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=40}}," Aftershock  "}
@@ -2297,7 +2296,7 @@ c["Dodge Roll avoids all Hits 10% less Movement and Skill Speed per Dodge Roll i
 c["Dodge Roll cannot Avoid Damage"]={nil,"Dodge Roll cannot Avoid Damage "}
 c["Dodge Roll cannot Avoid Damage Take 30% less Damage from Hits while Dodge Rolling"]={nil,"Dodge Roll cannot Avoid Damage Take 30% less Damage from Hits while Dodge Rolling "}
 c["Dodge Roll passes through Enemies"]={nil,"Dodge Roll passes through Enemies "}
-c["Double Activation Delay of Curses"]={nil,"Double Activation Delay of Curses "}
+c["Double Activation Delay of Curses"]={{[1]={flags=0,keywordFlags=0,name="CurseDelay",type="MORE",value=100}},nil}
 c["Double Stun Threshold while Shield is Raised"]={nil,"Double Stun Threshold while Shield is Raised "}
 c["Double the number of your Poisons that targets can be affected by at the same time"]={{[1]={flags=0,keywordFlags=0,name="PoisonCanStack",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="PoisonStacks",type="MORE",value=100}},nil}
 c["Drop Ignited Ground while moving, which lasts 8 seconds and Ignites as though dealing Fire Damage equal to 10% of your maximum Life"]={nil,"Drop Ignited Ground while moving, which lasts 8 seconds and Ignites as though dealing Fire Damage equal to 10% of your maximum Life "}

src/Data/SkillStatMap.lua

@@ -2130,6 +2130,13 @@ return {
 ["curse_cast_speed_+%"] = {
 	mod("Speed", "INC", nil, ModFlag.Cast),
 },
+["curse_delay_duration_ms"] = {
+	skill("curseDelay", nil),
+	div = 1000,
+},
+["base_curse_delay_+%"] = {
+	mod("CurseFrequency", "INC", nil),
+},
 -- Hex
 ["curse_maximum_doom"] = {
 	mod("MaxDoom", "BASE", nil),

src/Data/Skills/minion.lua

@@ -899,4 +899,39 @@ skills["MPSAncestralTotemSpiritSoulCasterProjectile"] = {
 			},
 		},
 	}
-}
+}
+			skills["MinionInstability"] = {
+				name = "Minion Instability",
+				hidden = true,
+				skillTypes = { [SkillType.Damage] = true, },
+				qualityStats = {
+				},
+				levels = {
+					[1] = { levelRequirement = 0, },
+				},
+				preDamageFunc = function(activeSkill, output)
+					local skillData = activeSkill.skillData
+					skillData.FireBonusMin = output.Life * skillData.selfFireExplosionLifeMultiplier
+					skillData.FireBonusMax = output.Life * skillData.selfFireExplosionLifeMultiplier
+				end,
+				statSets = {
+					[1] = {
+						label = "Minion Instability",
+						incrementalEffectiveness = 0,
+						statDescriptionScope = "skill_stat_descriptions",
+						baseFlags = {
+						},
+						baseMods = {
+							skill("selfFireExplosionLifeMultiplier", 0.01, { type = "Multiplier", var = "MinionInstabilityBaseDamage" }),
+							skill("showAverage", true),
+						},
+						constantStats = {
+						},
+						stats = {
+						},
+						levels = {
+							[1] = { },
+						},
+					},
+				}
+			}

src/Data/Skills/sup_int.lua

@@ -1969,15 +1969,18 @@ skills["ViciousHexSupportPlayer"] = {
 			statDescriptionScope = "skill_stat_descriptions",
 			statMap = {
 				["impending_doom_base_added_chaos_damage_%_of_current_mana"] = {
-					mod("ChaosMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "DoomBlastManaPercentage" }),
-					mod("ChaosMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "DoomBlastManaPercentage" }),
+					mod("ChaosMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+					mod("ChaosMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
 					div = 100,
 				},
 			},
 			baseFlags = {
 				spell = true,
 				area = true,
 			},
+			baseMods = {
+				skill("currentManaPercentage", true),
+			},
 			constantStats = {
 				{ "impending_doom_base_added_chaos_damage_%_of_current_mana", 15 },
 				{ "active_skill_base_area_of_effect_radius", 20 },
@@ -2222,7 +2225,18 @@ skills["SupportManaFlarePlayer"] = {
 			label = "Mana Flare",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "skill_stat_descriptions",
+			statMap = {
+				["support_mana_flare_%_of_current_mana_consumed"] = {
+					mod("FireMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+					mod("FireMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+					div = 100,
+				},
+			},
 			baseFlags = {
+				spell = true,
+			},
+			baseMods = {
+				skill("currentManaPercentage", true),
 			},
 			constantStats = {
 				{ "triggered_by_mana_flare_support_%", 100 },
@@ -2253,6 +2267,12 @@ skills["SupportMinionInstabilityPlayer"] = {
 			label = "Minion Instability",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["explode_on_low_life_%_maximum_life_to_deal"] = {
+					mod("MinionModifier", "LIST", { mod = mod("Multiplier:MinionInstabilityBaseDamage", "BASE", nil) }),
+					mod("ExtraMinionSkill", "LIST", { skillId = "MinionInstability" }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2312,6 +2332,11 @@ skills["SupportMinionPactPlayer"] = {
 			label = "Minion Pact",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_minion_pact_damage_+%_final"] = {
+					mod("Damage", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {

src/Export/Skills/minion.txt

@@ -137,4 +137,40 @@ local skills, mod, flag, skill = ...
 #set MPSAncestralTotemSpiritSoulCasterProjectile
 #flags spell projectile
 #mods
-#skillEnd
+#skillEnd
+
+skills["MinionInstability"] = {
+	name = "Minion Instability",
+	hidden = true,
+	skillTypes = { [SkillType.Damage] = true, },
+	qualityStats = {
+	},
+	levels = {
+		[1] = { levelRequirement = 0, },
+	},
+	preDamageFunc = function(activeSkill, output)
+		local skillData = activeSkill.skillData
+		skillData.FireBonusMin = output.Life * skillData.selfFireExplosionLifeMultiplier
+		skillData.FireBonusMax = output.Life * skillData.selfFireExplosionLifeMultiplier
+	end,
+	statSets = {
+		[1] = {
+			label = "Minion Instability",
+			incrementalEffectiveness = 0,
+			statDescriptionScope = "skill_stat_descriptions",
+			baseFlags = {
+			},
+			baseMods = {
+				skill("selfFireExplosionLifeMultiplier", 0.01, { type = "Multiplier", var = "MinionInstabilityBaseDamage" }),
+				skill("showAverage", true),
+			},
+			constantStats = {
+			},
+			stats = {
+			},
+			levels = {
+				[1] = { },
+			},
+		},
+	}
+}

src/Export/Skills/sup_int.txt

@@ -504,10 +504,11 @@ statMap = {
 #startSets
 #set DoomBlastPlayer
 #flags spell area
+#baseMod skill("currentManaPercentage", true)
 statMap = {
 	["impending_doom_base_added_chaos_damage_%_of_current_mana"] = {
-		mod("ChaosMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "DoomBlastManaPercentage" }),
-		mod("ChaosMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "DoomBlastManaPercentage" }),
+		mod("ChaosMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+		mod("ChaosMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
 		div = 100,
 	},
 },
@@ -566,12 +567,27 @@ statMap = {
 #skill TriggeredManaFlarePlayer
 #startSets
 #set TriggeredManaFlarePlayer
+#flags spell
+#baseMod skill("currentManaPercentage", true)
+statMap = {
+	["support_mana_flare_%_of_current_mana_consumed"] = {
+		mod("FireMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+		mod("FireMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Mana", percentVar = "CurrentManaPercentage" }),
+		div = 100,
+	},
+},
 #mods
 #skillEnd
 
 #skill SupportMinionInstabilityPlayer
 #startSets
 #set SupportMinionInstabilityPlayer
+statMap = {
+	["explode_on_low_life_%_maximum_life_to_deal"] = {
+		mod("MinionModifier", "LIST", { mod = mod("Multiplier:MinionInstabilityBaseDamage", "BASE", nil) }),
+		mod("ExtraMinionSkill", "LIST", { skillId = "MinionInstability" }),
+	},
+},
 #mods
 #skillEnd
 
@@ -584,6 +600,11 @@ statMap = {
 #skill SupportMinionPactPlayer
 #startSets
 #set SupportMinionPactPlayer
+statMap = {
+	["support_minion_pact_damage_+%_final"] = {
+		mod("Damage", "MORE", nil),
+	},
+},
 #mods
 #skillEnd
 

src/Modules/CalcOffence.lua

@@ -1121,6 +1121,25 @@ function calcs.offence(env, actor, activeSkill)
 		if breakdown then
 			breakdown.CurseEffectMod = breakdown.mod(skillModList, skillCfg, "CurseEffect")
 		end
+
+		local curseFrequencyMod = calcLib.mod(skillModList, skillCfg, "CurseFrequency")
+		local curseDelayMod = calcLib.mod(skillModList, skillCfg, "CurseDelay")
+		local delayBase = (skillData.curseDelay or 0) + skillModList:Sum("BASE", skillCfg, "CurseDelay")
+		output.CurseDelay = delayBase / curseFrequencyMod * curseDelayMod
+		output.CurseDelay = m_ceil(output.CurseDelay * data.misc.ServerTickRate) / data.misc.ServerTickRate
+		if breakdown and output.CurseDelay ~= delayBase then
+			breakdown.CurseDelay = {
+				s_format("%.2fs ^8(base)", delayBase),
+			}
+			if curseFrequencyMod ~= 1 then
+				t_insert(breakdown.CurseDelay, s_format("x %.4f ^8(frequency modifier)", curseFrequencyMod))
+			end
+			if curseDelayMod ~= 1 then
+				t_insert(breakdown.CurseDelay, s_format("x %.4f ^8(delay modifier)", curseDelayMod))
+			end
+			t_insert(breakdown.CurseDelay, s_format("rounded up to nearest server tick"))
+			t_insert(breakdown.CurseDelay, s_format("= %.3fs", output.CurseDelay))
+		end
 	end
 	if activeSkill.skillTypes[SkillType.Mark] then
 		output.MarkEffectMod = calcLib.mod(skillModList, skillCfg, "MarkEffect")

src/Modules/CalcSections.lua

@@ -693,6 +693,7 @@ return {
 		{ breakdown = "CurseEffectMod" },
 		{ modName = "CurseEffect", cfg = "skill" },
 	}, },
+	{ label = "Curse Delay", haveOutput = "CurseDelay", { format = "{3:output:CurseDelay}s", { breakdown = "CurseDelay" }, { modName = { "CurseFrequency" }, cfg = "skill" }, { modName = { "CurseDelay" }, cfg = "skill" } }, },
 	{ label = "Curse Limit", haveOutput = "CurseEffectMod", { format = "{0:output:EnemyCurseLimit}",
 		{ breakdown = "EnemyCurseLimit" },
 		{ modName = { "CurseLimitIsMaximumPowerCharges", "EnemyCurseLimit" } },

src/Modules/ConfigOptions.lua

@@ -103,6 +103,9 @@ local configSettings = {
 	{ var = "detonateDeadCorpseLife", type = "count", label = "Enemy Corpse ^xE05030Life:", ifSkillData = "explodeCorpse", tooltip = "Sets the maximum ^xE05030life ^7of the target corpse for Detonate Dead and similar skills.\nFor reference, a level 70 monster has "..data.monsterLifeTable[70].." base ^xE05030life^7, and a level 80 monster has "..data.monsterLifeTable[80]..".", apply = function(val, modList, enemyModList)
 		modList:NewMod("SkillData", "LIST", { key = "corpseLife", value = val }, "Config")
 	end },
+	{ var = "multiplierCurrentManaPercentage", type = "count", label = "Current ^x7070FFMana^7 %:", ifSkillData = "currentManaPercentage", defaultState = 100, apply = function(val, modList, enemyModList)
+		modList:NewMod("Multiplier:CurrentManaPercentage", "BASE", m_max(m_min(val,100), 0), "Config")
+	end },
 	{ var = "conditionStationary", type = "count", label = "Time spent stationary", ifCond = "Stationary",
 		tooltip = "Applies mods that use `while stationary` and `per / every second while stationary`",
 		apply = function(val, modList, enemyModList)
@@ -319,9 +322,6 @@ local configSettings = {
 	{ var = "curseOverlaps", type = "count", label = "Curse overlaps:", ifSkill = "Doom Blast", ifFlag = "UsesCurseOverlaps", apply = function(val, modList, enemyModList)
 		modList:NewMod("Multiplier:CurseOverlaps", "BASE", val, "Config", { type = "Condition", var = "Effective" })
 	end },
-	{ var = "doomBlastManaPercentage", type = "count", label = "Current ^x7070FFMana^7 %:", tooltip = "Ignores values outside the 0-100 range, defaults to 100% if not specified.", ifSkill = "Doom Blast", apply = function(val, modList, enemyModList)
-		modList:NewMod("Multiplier:DoomBlastManaPercentage", "BASE", m_max(m_min(val,100), 0), "Config", { type = "SkillName", skillName = "Doom Blast" })
-	end },
 	{ label = "Embrace Madness:", ifSkill = "Embrace Madness" },
 	{ var = "embraceMadnessActive", type = "check", label = "Is Embrace Madness active?", ifSkill = "Embrace Madness", apply = function(val, modList, enemyModList)
 		modList:NewMod("Condition:AffectedByGloriousMadness", "FLAG", true, "Config")

src/Modules/ModParser.lua

@@ -610,6 +610,7 @@ local modNameList = {
 	["metre to melee strike range"] = { "MeleeWeaponRangeMetre", "UnarmedRangeMetre" },
 	["to deal double damage"] = "DoubleDamageChance",
 	["to deal triple damage"] = "TripleDamageChance",
+	["curse activation"] = "CurseFrequency",
 	-- Effects
 	["onslaught effect"] = "OnslaughtEffect",
 	["effect of onslaught on you"] = "OnslaughtEffect",
@@ -3509,6 +3510,7 @@ local specialModList = {
 	["you can apply an additional curse while at maximum power charges"] = { mod("EnemyCurseLimit", "BASE", 1, { type = "StatThreshold", stat = "PowerCharges", thresholdStat = "PowerChargesMax" }) },
 	["you can apply one fewer curse"] = { mod("EnemyCurseLimit", "BASE", -1) },
 	["you can apply an additional mark"] = { mod("EnemyMarkLimit", "BASE", 1) },
+	["double activation delay of curses"] = { mod("CurseDelay", "MORE", 100) },
 	["curses on enemies in your chilling areas have (%d+)%% increased effect"] = function(num) return { mod("CurseEffect", "INC", num, { type = "ActorCondition", actor = "enemy", var = "InChillingArea" }) } end,
 	["hexes you inflict have their effect increased by twice their doom instead"] = { mod("DoomEffect", "MORE", 100) },
 	["nearby enemies have an additional (%d+)%% chance to receive a critical hit"] = function(num) return { mod("EnemyModifier", "LIST", { mod = mod("SelfExtraCritChance", "BASE", num) }) } end,