refactor handle slow magnitude and slow effect

Author: igorwessel

src/Modules/CalcPerform.lua

@@ -756,15 +756,27 @@ local function applySlowMagnitude(env)
 	end
 
 	if enemyDB:Flag(nil, "Condition:Slowed") then
-		local slowMagnitude = modDB:Sum("INC", nil, "EnemySlowMagnitude")  / 100
-		if slowMagnitude > 0 then
-			enemyDB:ScaleAddMod(modLib.createMod("TemporalChainsActionSpeed", "INC", enemyDB:Sum("INC", nil, "TemporalChainsActionSpeed"), "Slow Magnitude"), slowMagnitude)
-			enemyDB:ScaleAddMod(modLib.createMod("ApexOfMomentSlow", "INC", enemyDB:Sum("INC", nil, "ApexOfMomentSlow"), "Slow Magnitude"), slowMagnitude)
+		local slowMagnitude = modDB:Sum("INC", nil, "EnemySlowMagnitude")
+		local lessSlow = enemyDB:More("MORE", nil, "Slow", "Less Slow")
+		slowMagnitude = slowMagnitude * lessSlow / 100
+
+		-- magic 34% in my current build
+		-- rare 28% in my current build
+		-- unique 20% in my current build
+		for _, value in ipairs(enemyDB:Tabulate("INC", nil, "TemporalChainsActionSpeed", "ApexOfMomentSlow")) do
+			local mod = value.mod
+			if lessSlow ~= 0 then
+				enemyDB:ReplaceMod(mod.name, mod.type, mod.value * lessSlow, mod.source,  mod.flags, mod.keywordFlags, unpack(mod))
+			end
+
+			enemyDB:ScaleAddMod(modLib.createMod(value.mod.name, value.mod.type, value.mod.value, "Slow Magnitude"), slowMagnitude)
+
+			ConPrintTable(value, false)
 		end
 	end
 end
 
-function calcs.actionSpeedMod(actor)
+function calcs.actionSpeedMod(actor)	
 	local modDB = actor.modDB
 	local minimumActionSpeed = modDB:Max(nil, "MinimumActionSpeed") or 0
 	local maximumActionSpeedReduction = modDB:Max(nil, "MaximumActionSpeedReduction")
@@ -773,7 +785,7 @@ function calcs.actionSpeedMod(actor)
 	local tempChains = modDB:Sum("INC", nil, "TemporalChainsActionSpeed")
 	local chill = modDB:Sum("INC", nil, "ActionSpeed", "Chill")
 
-	local slowMultiplier = (1 + tempChains / 100) * (1 + apexOfMoment / 100) * (1 + chill / 100) * modDB:More(nil, "ActionSpeed", "Less Slow")
+	local slowMultiplier = (1 + tempChains / 100) * (1 + apexOfMoment / 100) * (1 + chill / 100)
 	local slowEffect = (1 - slowMultiplier) * 100 
 
 	local actionSpeedMod = 1 + (-slowEffect + modDB:Sum("INC", nil, "ActionSpeed")) / 100

src/Modules/CalcSections.lua

@@ -630,10 +630,13 @@ return {
 	    { breakdown = "QuantityMultiplier" },
 	    { modName = { "QuantityMultiplier" }, cfg = "skill" },
 	}, },
-	{ label = "Skill Cooldown", haveOutput = "Cooldown", { format = "{3:output:EffectiveCooldown}s",
+	{ label = "Skill Cooldown", haveOutput = "Cooldown", { format = "{3:output:Cooldown}s",
 		{ breakdown = "Cooldown" }, 
+		{ modName = {"CooldownRecovery"}, cfg = "skill" },
+	}, },
+	{ label = "Eff. Skill Cooldown", haveOutput = "EffectiveCooldown", { format = "{3:output:EffectiveCooldown}s",
 		{ breakdown = "EffectiveCooldown" }, 
-		{ modName = {"CooldownRecovery", "CooldownChanceNotConsume"}, cfg = "skill" },
+		{ modName = {"CooldownChanceNotConsume"}, cfg = "skill" },
 	}, },
 	{ label = "Stored Uses", haveOutput = "StoredUses", { format = "{output:StoredUses}",
 	{ breakdown = "StoredUses" },
@@ -691,6 +694,10 @@ return {
 		{ breakdown = "SpiritReservedMod" },
 		{ modName = { "SpiritReserved", "Reserved", "SupportManaMultiplier", "SpiritReservationEfficiency", "ReservationEfficiency", "ExtraSpirit"  }, cfg = "skill"}
 	}, },
+	{ label = "Slow Mod", haveOutput = "SlowMagnitude", { format = "x {2:output:SlowMagnitude}",
+		{ breakdown = "CurseEffectMod" },
+		{ modName = "EnemySlowMagnitude", cfg = "skill" },
+	}, },
 	{ label = "Curse Effect Mod", haveOutput = "CurseEffectMod", { format = "x {2:output:CurseEffectMod}",
 		{ breakdown = "CurseEffectMod" },
 		{ modName = "CurseEffect", cfg = "skill" },

src/Modules/ConfigOptions.lua

@@ -1698,11 +1698,11 @@ Huge sets the radius to 11.
 	end },
 	{ var = "conditionEnemyMagic", type = "check", label = s_format("Is the enemy %sMagic?", colorCodes.MAGIC), tooltip = "", apply = function(val, modList, enemyModList)
 		enemyModList:NewMod("Condition:Magic", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
-		enemyModList:NewMod("ActionSpeed", "MORE", 15, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
+		enemyModList:NewMod("Slow", "MORE", -15, "Less Slow", { type = "Condition", var = "Effective" })
 	end },
 	{ var = "conditionEnemyRare", type = "check", label = s_format("Is the enemy %sRare?", colorCodes.RARE), tooltip = "", apply = function(val, modList, enemyModList)
 		enemyModList:NewMod("Condition:Rare", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
-		enemyModList:NewMod("ActionSpeed", "MORE", 30, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
+		enemyModList:NewMod("Slow", "MORE", -30, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
 	end },
 	{ var = "enemyIsBoss", type = "list", label = "Is the enemy a Boss?", defaultIndex = 3, tooltip = data.enemyIsBossTooltip, list = {{val="None",label="No"},{val="Boss",label="Standard Boss"},{val="Pinnacle",label="Guardian/Pinnacle Boss"},{val="Uber",label="Uber Pinnacle Boss"}}, apply = function(val, modList, enemyModList, build)
 		-- These defaults are here so that the placeholders get reset correctly
@@ -1741,7 +1741,7 @@ Huge sets the radius to 11.
 		elseif val == "Boss" then	
 			enemyModList:NewMod("Condition:Unique", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
 			enemyModList:NewMod("Condition:RareOrUnique", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
-		    enemyModList:NewMod("ActionSpeed", "MORE", 50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
+		    enemyModList:NewMod("Slow", "MORE", -50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
 			enemyModList:NewMod("AilmentThreshold", "MORE", 488, "Boss")
 			modList:NewMod("WarcryPower", "BASE", 20, "Boss")
 			modList:NewMod("Multiplier:EnemyPower", "BASE", 20, "Boss")
@@ -1778,7 +1778,7 @@ Huge sets the radius to 11.
 			enemyModList:NewMod("Condition:Unique", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
 			enemyModList:NewMod("Condition:RareOrUnique", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
 			enemyModList:NewMod("Condition:PinnacleBoss", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
-		    enemyModList:NewMod("ActionSpeed", "MORE", 50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
+		    enemyModList:NewMod("Slow", "MORE", -50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
 			enemyModList:NewMod("AilmentThreshold", "MORE", 404, "Boss")
 			modList:NewMod("WarcryPower", "BASE", 20, "Boss")
 			modList:NewMod("Multiplier:EnemyPower", "BASE", 20, "Boss")
@@ -1812,7 +1812,7 @@ Huge sets the radius to 11.
 		elseif val == "Uber" then
 			enemyModList:NewMod("Condition:RareOrUnique", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
 			enemyModList:NewMod("Condition:PinnacleBoss", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
-		    enemyModList:NewMod("ActionSpeed", "MORE", 50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
+		    enemyModList:NewMod("Slow", "MORE", -50, "Less Slow", { type = "Condition", var = "Effective" }, { type = "Condition", var = "Slowed" })
 			enemyModList:NewMod("DamageTaken", "MORE", -70, "Boss")
 			enemyModList:NewMod("AilmentThreshold", "MORE", 404, "Boss")
 			modList:NewMod("WarcryPower", "BASE", 20, "Boss")