Merge branch 'dev' into feature/empty-roar-and-some-0.5-tree-nodes

Author: LocalIdentity

spec/System/TestLoadouts_spec.lua

@@ -470,7 +470,7 @@ describe("TestLoadouts", function()
 				end)
 
 			it(
-				"correctly reorders loadouts when filtered list is first in speclist",
+				"correctly reorders loadouts when filtered list is first in specList",
 				function()
 					build:NewLoadout("Filtered")
 					build:NewLoadout("Loadout B")
@@ -970,7 +970,7 @@ describe("TestLoadouts", function()
 				assert.is_true(build.modFlag)
 			end)
 
-			it("does not leave the config set in a broken state when deleting the last configset along with the loadout",
+			it("does not leave the config set in a broken state when deleting the last ConfigSet along with the loadout",
 				function()
 					local loadoutName = "Loadout To Delete"
 					buildSetService:NewLoadout(loadoutName)

spec/System/TestSkills_spec.lua

@@ -285,6 +285,17 @@ describe("TestSkills", function()
 		assert.True(baseLeapSlamHit < build.calcsTab.mainOutput.AverageDamage)
 	end)
 
+	it("applies minion offensive multiplier to all attack damage", function()
+		build.skillsTab:PasteSocketGroup("Wolf Pack 20/0  1")
+		runCallback("OnFrame")
+
+		local minion = build.calcsTab.mainEnv.minion
+		local expectedPhysicalMax = round(build.calcsTab.mainEnv.data.monsterAllyDamageTable[minion.level] * (1 + minion.minionData.damageSpread))
+
+		assert.are.equals(expectedPhysicalMax, minion.weaponData1.PhysicalMax)
+		assert.are.near(-30, minion.mainSkill.skillModList:Sum("MORE", minion.mainSkill.skillCfg, "Damage"), 0.0001)
+	end)
+
 	it("Inspiring Ally only mirrors companion damage, not generic minion damage", function()
 		build.itemsTab:CreateDisplayItemFromRaw([[
 			New Item
@@ -934,4 +945,4 @@ describe("TestSkills", function()
 		local expectedAverageEffect = 1 + (build.calcsTab.calcsOutput.MaxAncestralEmpowermentCombinedDamageEffect - 1) * build.calcsTab.calcsOutput.AncestralEmpowermentCombinedUptimeRatio / 100
 		assert.are.equals(round(expectedAverageEffect, 4), round(build.calcsTab.calcsOutput.AvgAncestralEmpowermentCombinedDamageEffect, 4))
 	end)
-end)
+end)

src/Data/Skills/act_dex.lua

@@ -898,9 +898,6 @@ skills["SummonBeastPlayer"] = {
 				summonBeast = true,
 				duration = true,
 			},
-			baseMods = {
-				mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 25) }), --Server side damage mod added in 0.3,
-			},
 			constantStats = {
 				{ "minion_base_resummon_time_ms", 12000 },
 			},

src/Data/Skills/act_int.lua

@@ -19767,9 +19767,6 @@ skills["SummonSpectrePlayer"] = {
 				spectre = true,
 				duration = true,
 			},
-			baseMods = {
-				mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 25) }), --Server side damage mod added in 0.3,
-			},
 			constantStats = {
 				{ "minion_base_resummon_time_ms", 12000 },
 				{ "spectre_warp_start_distance", 100 },

src/Export/Classes/RowListControl.lua

@@ -47,10 +47,10 @@ function RowListClass:BuildColumns()
 	wipeTable(self.colList)
 	self.colList[1] = { width = 50, label = "#", font = "FIXED", sortable = true }
 	for _, specCol in ipairs(main.curDatFile.spec) do
-		t_insert(self.colList, { 
-			width = specCol.width, 
+		t_insert(self.colList, {
+			width = specCol.width,
 			specColRef = specCol,  -- Link to the original data
-			label = specCol.name, 
+			label = specCol.name,
 			font = function() return IsKeyDown("ALT") and "FIXED" or "VAR" end,
 			sortable = true
 		})
@@ -108,7 +108,7 @@ function RowListClass:Draw(viewPort)
 
 	local cursorX, cursorY = GetCursorPos()
 
-	local label = self:GetProperty("label") 
+	local label = self:GetProperty("label")
 	if label then
 		DrawString(x + self.labelPositionOffset[1], y - 20 + self.labelPositionOffset[2], "LEFT", 16, self.font, label)
 	end
@@ -360,3 +360,15 @@ function RowListClass:OnKeyUp(key, doubleClick)
 	end
 	return self
 end
+
+function RowListClass:OnKeyDown(key, doubleClick)
+	if key == "PAGEUP" then
+		self.controls.scrollBarV:Scroll(-math.floor(self:GetRowRegion().height / self.rowHeight))
+		return self
+	elseif key == "PAGEDOWN" then
+		self.controls.scrollBarV:Scroll(math.floor(self:GetRowRegion().height / self.rowHeight))
+		return self
+	end
+
+	return self.ListControl.OnKeyDown(self, key, doubleClick)
+end

src/Export/Scripts/passivetree_ggg.lua

@@ -384,8 +384,12 @@ for id, node in pairsSortByKey(data.nodes) do
 
 		-- TODO: minimal check
 		local nodeOrbit = 0
-		if orbitDataSearch.orbit ~= nil and orbitDataSearch.orbit ~= 0  then
-			nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
+		if orbitDataSearch.orbit ~= nil then
+			if orbitDataSearch.orbit == 0 and not orbitDataSearch.orbitX and not orbitDataSearch.orbitY then
+				nodeOrbit = 0x7FFFFFFF
+			else
+				nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
+			end
 		end
 
 		local connectionData = {
@@ -403,11 +407,14 @@ for id, node in pairsSortByKey(data.nodes) do
 			["ascendancy"] = ascendancySearchNameById[node.unlockConstraint.ascendancy],
 			["nodes"] = node.unlockConstraint.nodes,
 		}
-		nodeData["nodeOverlay"] = {
-			["alloc"] = "OracleFrameAllocated",
-			["path"] = "OracleFrameCanAllocate",
-			["unalloc"] = "OracleFrameUnallocated",
-		}
+
+		if not node.isMastery then
+			nodeData["nodeOverlay"] = {
+				["alloc"] = "OracleFrameAllocated",
+				["path"] = "OracleFrameCanAllocate",
+				["unalloc"] = "OracleFrameUnallocated",
+			}
+		end
 	end
 
 	orbitsConstants[node.orbit + 1] = math.max(orbitsConstants[node.orbit + 1] or 1, node.orbitIndex)

src/Export/Skills/act_dex.txt

@@ -91,7 +91,6 @@ statMap = {
 #skill SummonBeastPlayer
 #set SummonBeastPlayer
 #flags spell minion summonBeast duration
-#baseMod mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 25) }), --Server side damage mod added in 0.3
 #mods
 #skillEnd
 

src/Export/Skills/act_int.txt

@@ -1354,7 +1354,6 @@ statMap = {
 #skill SummonSpectrePlayer
 #set SummonSpectrePlayer
 #flags spell minion spectre duration
-#baseMod mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", 25) }), --Server side damage mod added in 0.3
 #mods
 #skillEnd
 

src/Modules/CalcActiveSkill.lua

@@ -638,9 +638,13 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 
 	-- The damage fixup stat applies x% less base Attack Damage and x% more base Attack Speed as confirmed by Openarl Jan 4th 2024
 	-- Implemented in this manner as the stat exists on the minion not the skills 
-	if activeSkill.actor and activeSkill.actor.minionData and activeSkill.actor.minionData.damageFixup then
-		skillModList:NewMod("Damage", "MORE", -100 * activeSkill.actor.minionData.damageFixup, "Damage Fixup", ModFlag.Attack)
-		skillModList:NewMod("Speed", "MORE", 100 * activeSkill.actor.minionData.damageFixup, "Damage Fixup", ModFlag.Attack)
+	if activeSkill.actor and activeSkill.actor.minionData then
+		if activeSkill.actor.minionData.damageFixup then
+			skillModList:NewMod("Damage", "MORE", -100 * activeSkill.actor.minionData.damageFixup, "Damage Fixup", ModFlag.Attack)
+			skillModList:NewMod("Speed", "MORE", 100 * activeSkill.actor.minionData.damageFixup, "Damage Fixup", ModFlag.Attack)
+		elseif activeSkill.actor.minionData.damage ~= 1 then
+			skillModList:NewMod("Damage", "MORE", (activeSkill.actor.minionData.damage - 1) * 100, activeSkill.actor.minionData.name .." Damage Multiplier", ModFlag.Attack)
+		end
 	end
 	if skillModList:Flag(activeSkill.skillCfg, "DisableSkill") and not skillModList:Flag(activeSkill.skillCfg, "EnableSkill") then
 		skillFlags.disable = true
@@ -819,13 +823,13 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 	end
 
 	-- Create minion
-	local minionList, isSpectre, isBeastCompanion
+	local minionList, monsterDamage
 	if activeGrantedEffect.minionList and activeGrantedEffect.name:match("^Spectre") then
 			minionList = copyTable(env.build.spectreList)
-			isSpectre = true
+			monsterDamage = true
 	elseif activeGrantedEffect.minionList and activeGrantedEffect.name:match("^Companion") then
 			minionList = copyTable(env.build.beastList)
-			isBeastCompanion = true
+			monsterDamage = true
 	elseif activeGrantedEffect.minionList and activeGrantedEffect.minionList[1] then
 			minionList = copyTable(activeGrantedEffect.minionList)
 	else
@@ -879,8 +883,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 				minion.lifeTable = env.data.monsterAllyLifeTable
 			end
 			local attackTime = minion.minionData.attackTime
-			local damageTable = (isSpectre or minion.minionData.hostile) and env.data.monsterDamageTable or env.data.monsterAllyDamageTable
-			local damage = damageTable[minion.level] * minion.minionData.damage
+			local damageTable = (monsterDamage or minion.minionData.hostile) and env.data.monsterDamageTable or env.data.monsterAllyDamageTable
+			minion.hiddenDamageFixup = monsterDamage and (round(env.data.monsterAllyDamageTable[minion.level] / damageTable[minion.level] * data.misc.SpectreBeastDamageFixup, 2) - 1) or 0
+			local damage = damageTable[minion.level]
 			if not minion.minionData.baseDamageIgnoresAttackSpeed then -- minions with this flag do not factor attack time into their base damage
 				 damage = damage * attackTime
 			end

src/Modules/CalcPerform.lua

@@ -1001,6 +1001,7 @@ function calcs.perform(env, skipEHP)
 		env.minion.modDB:NewMod("ProjectileCount", "BASE", 1, "Base")
 		env.minion.modDB:NewMod("PhysicalHeavyStunBuildup", "MORE", data.monsterConstants["physical_hit_damage_stun_multiplier_+%_final_from_ot"], "Physical Damage")
 		env.minion.modDB:NewMod("EnemyHeavyStunBuildup", "MORE", data.monsterConstants["melee_hit_damage_stun_multiplier_+%_final_from_ot"], "Melee Damage", ModFlag.Melee)
+		env.minion.modDB:NewMod("Damage", "MORE", env.minion.hiddenDamageFixup * 100, "Hidden Level Scaling")
 		for _, mod in ipairs(env.minion.minionData.modList) do
 			env.minion.modDB:AddMod(mod)
 		end