Split calc prepass from skill-local pass

Author: Nostrademous

src/Modules/CalcPerform.lua

@@ -1074,14 +1074,38 @@ end
 -- 8. Processes buffs and debuffs
 -- 9. Processes charges and misc buffs (doActorCharges, doActorMisc)
 -- 10. Calculates defence and offence stats (calcs.defence, calcs.offence)
-function calcs.perform(env, skipEHP)
-	local modDB = env.modDB
-	local enemyDB = env.enemyDB
+function calcs.performActorPrepass(env, options)
+	options = options or { }
+	local prepassState = {
+		partyTabEnableExportBuffs = env.build.partyTab.enableExportBuffs and env.mode ~= "CALCULATOR",
+	}
+	env.partyMembers = env.build.partyTab.actor
+	env.player.partyMembers = env.partyMembers
 
-	-- Merge keystone modifiers
+	-- Merge keystone modifiers once per actor-global pass so the skill-local
+	-- phase can reuse the resulting DB baseline.
 	env.keystonesAdded = { }
 	modLib.mergeKeystones(env, env.modDB)
 
+	if options.snapshotDBs then
+		prepassState.cachedPlayerDB, prepassState.cachedEnemyDB, prepassState.cachedMinionDB = specCopy(env)
+		prepassState.cachedPlayerDB.parent = env.modDB.parent
+		prepassState.cachedEnemyDB.parent = env.enemyDB.parent
+		if prepassState.cachedMinionDB and env.minion and env.minion.modDB then
+			prepassState.cachedMinionDB.parent = env.minion.modDB.parent
+		end
+	end
+	env.performActorPrepassState = prepassState
+	return prepassState
+end
+
+function calcs.performSkillPass(env, skipEHP, prepassState)
+	local modDB = env.modDB
+	local enemyDB = env.enemyDB
+	prepassState = prepassState or env.performActorPrepassState
+	env.partyMembers = env.partyMembers or env.build.partyTab.actor
+	env.player.partyMembers = env.partyMembers
+
 	-- Build minion skills
 	for _, activeSkill in ipairs(env.player.activeSkillList) do
 		activeSkill.skillModList = new("ModList", activeSkill.baseSkillModList)
@@ -1097,9 +1121,7 @@ function calcs.perform(env, skipEHP)
 	env.enemy.output = { }
 	local output = env.player.output
 
-	env.partyMembers = env.build.partyTab.actor
-	env.player.partyMembers = env.partyMembers
-	local partyTabEnableExportBuffs = env.build.partyTab.enableExportBuffs and env.mode ~= "CALCULATOR"
+	local partyTabEnableExportBuffs = prepassState and prepassState.partyTabEnableExportBuffs or (env.build.partyTab.enableExportBuffs and env.mode ~= "CALCULATOR")
 
 	env.minion = env.player.mainSkill.minion
 	if env.minion then
@@ -3591,3 +3613,8 @@ function calcs.perform(env, skipEHP)
 
 	cacheData(env.requestedSkillUUID or cacheSkillUUID(env.player.mainSkill, env), env)
 end
+
+function calcs.perform(env, skipEHP)
+	local prepassState = calcs.performActorPrepass(env)
+	return calcs.performSkillPass(env, skipEHP, prepassState)
+end

src/Modules/Calcs.lua

@@ -207,6 +207,10 @@ end
 function calcs.calcFullDPS(build, mode, override, specEnv)
 	local fullEnv, cachedPlayerDB, cachedEnemyDB, cachedMinionDB = calcs.initEnv(build, mode, override, specEnv)
 	local usedEnv = nil
+	local prepassState = calcs.performActorPrepass(fullEnv, { snapshotDBs = true })
+	local skillPassPlayerDB = prepassState.cachedPlayerDB or cachedPlayerDB
+	local skillPassEnemyDB = prepassState.cachedEnemyDB or cachedEnemyDB
+	local skillPassMinionDB = prepassState.cachedMinionDB or cachedMinionDB
 
 	local fullDPS = {
 		combinedDPS = 0,
@@ -238,7 +242,7 @@ function calcs.calcFullDPS(build, mode, override, specEnv)
 			local activeSkillCount, enabled = getActiveSkillCount(activeSkill)
 			if enabled then
 				fullEnv.player.mainSkill = activeSkill
-				calcs.perform(fullEnv, true)
+				calcs.performSkillPass(fullEnv, true, prepassState)
 				usedEnv = fullEnv
 				local output = usedEnv.player.output
 				local minionOutput = usedEnv.minion and usedEnv.minion.output or nil
@@ -368,9 +372,9 @@ function calcs.calcFullDPS(build, mode, override, specEnv)
 					everything = true,
 				}
 				fullEnv, _, _, _ = calcs.initEnv(build, mode, override, {
-					cachedPlayerDB = cachedPlayerDB,
-					cachedEnemyDB = cachedEnemyDB,
-					cachedMinionDB = cachedMinionDB,
+					cachedPlayerDB = skillPassPlayerDB,
+					cachedEnemyDB = skillPassEnemyDB,
+					cachedMinionDB = skillPassMinionDB,
 					env = fullEnv,
 					accelerate = accelerationTbl,
 					cacheGeneration = fullEnv.cacheGeneration,
@@ -452,16 +456,19 @@ function calcs.buildActiveSkill(env, mode, skill, targetUUID, limitedProcessingF
 		skills = true,
 		everything = true,
 	} or nil
+	local cachedSkillPrepassState = env.cachedSkillBuildPrepassState
 	local fullEnv, _, _, _ = calcs.initEnv(env.build, mode, env.override, {
-		cachedPlayerDB = env.cachedPlayerDB,
-		cachedEnemyDB = env.cachedEnemyDB,
-		cachedMinionDB = env.cachedMinionDB,
+		cachedPlayerDB = cachedSkillPrepassState and cachedSkillPrepassState.cachedPlayerDB or env.cachedPlayerDB,
+		cachedEnemyDB = cachedSkillPrepassState and cachedSkillPrepassState.cachedEnemyDB or env.cachedEnemyDB,
+		cachedMinionDB = cachedSkillPrepassState and cachedSkillPrepassState.cachedMinionDB or env.cachedMinionDB,
 		env = env.cachedSkillBuildEnv,
 		accelerate = accelerationTbl,
 		cacheGeneration = env.cacheGeneration,
 		recursionGuards = recursionGuards,
 	})
 	env.cachedSkillBuildEnv = fullEnv
+	local prepassState = cachedSkillPrepassState or calcs.performActorPrepass(fullEnv, { snapshotDBs = true })
+	env.cachedSkillBuildPrepassState = prepassState
 
 	-- env.limitedSkills contains a map of uuids that should be limited in calculation
 	-- this is in order to prevent infinite recursion loops
@@ -478,7 +485,7 @@ function calcs.buildActiveSkill(env, mode, skill, targetUUID, limitedProcessingF
 		if activeSkillUUID == targetUUID then
 			fullEnv.player.mainSkill = activeSkill
 			fullEnv.requestedSkillUUID = targetUUID
-			calcs.perform(fullEnv, true)
+			calcs.performSkillPass(fullEnv, true, prepassState)
 			fullEnv.requestedSkillUUID = nil
 			recursionGuards.buildingSkills[guardKey] = nil
 			return true