Merge branch 'dev' into spectre-updates

Author: Blitz54

CONTRIBUTING.md

@@ -177,11 +177,14 @@ Files in `/Data` `/Export` and `/TreeData` can be massive and cause the EmmyLua
 ```json
 {
     "$schema": "https://raw.githubusercontent.com/EmmyLuaLs/emmylua-analyzer-rust/refs/heads/main/crates/emmylua_code_analysis/resources/schema.json",
+    "runtime": {
+        "version": "LuaJIT"
+    },
     "workspace": {
         "ignoreGlobs": [
-            "src/Data/**.lua",
-            "src/TreeData/**.lua",
-            "src/Modules/ModParser.lua"
+            "**/src/Data/**/*.lua",
+            "**/src/TreeData/**/*.lua",
+            "**/src/Modules/ModParser.lua"
         ]
     }
 }

spec/System/TestDefence_spec.lua

@@ -378,6 +378,53 @@ describe("TestDefence", function()
 		assert.are.equals(15, build.calcsTab.calcsOutput.LightningResistOverCap)
 	end)
 
+	it("ward chance to not break increases effective hit pool", function()
+		build.configTab.input.enemyIsBoss = "None"
+		build.configTab.input.customMods = "\z
+		+940 to maximum life\n\z
+		+200 to Ward\n\z
+		"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.equals(987, build.calcsTab.calcsOutput.TotalEHP)
+		assert.are.equals(1200, build.calcsTab.calcsOutput.PhysicalMaximumHitTaken)
+
+		build.configTab.input.customMods = "\z
+		+940 to maximum life\n\z
+		+200 to Ward\n\z
+		Ward has a 50% chance to not Break\n\z
+		"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.equals(994, build.calcsTab.calcsOutput.TotalEHP)
+		assert.are.equals(1200, build.calcsTab.calcsOutput.PhysicalMaximumHitTaken)
+	end)
+
+	it("small hits bypass unbroken ward", function()
+		build.configTab.input.enemyIsBoss = "None"
+		build.configTab.input.customMods = "\z
+		+940 to maximum life\n\z
+		+200 to Ward\n\z
+		Damage taken bypasses Unbroken Ward if the Hit deals less Damage than 15% of Ward\n\z
+		"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.equals(350, build.calcsTab.calcsOutput.TotalEHP)
+		assert.are.equals(1200, build.calcsTab.calcsOutput.PhysicalMaximumHitTaken)
+
+		local poolsRemaining = poolsRemainingAfterTypeMaxHit("Physical")
+		assert.are.equals(0, poolsRemaining.Ward)
+		assert.are.equals(0, poolsRemaining.Life)
+
+		poolsRemaining = build.calcsTab.calcs.reducePoolsByDamage(nil, { Physical = 29 }, build.calcsTab.calcsEnv.player)
+		assert.are.equals(200, poolsRemaining.Ward)
+		assert.are.equals(971, poolsRemaining.Life)
+
+		poolsRemaining = build.calcsTab.calcs.reducePoolsByDamage(nil, { Physical = 30 }, build.calcsTab.calcsEnv.player)
+		assert.are.equals(0, poolsRemaining.Ward)
+		assert.are.equals(1000, poolsRemaining.Life)
+	end)
+
 	-- fun part
 	it("armoured max hits", function()
 		build.configTab.input.enemyIsBoss = "None"
@@ -945,8 +992,19 @@ describe("TestDefence", function()
 
 		-- Get the base + Shabby Jerkin to make this test more adaptable to changes
 		local ironReflexesArmour = build.calcsTab.mainOutput.Armour - baseArmour - baseEvasion
+		assert.are.equals(ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
+
+		build.configTab.input.customMods = [[
+			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
+			you have no dexterity
+			Gain no armour from equipped body armour
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		-- Iron Reflexes and Prospero's Protection
+		assert.are.equals(baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
-		print("build.calcsTab.mainOutput.Armour:" .. build.calcsTab.mainOutput.Armour)
+		--print("build.calcsTab.mainOutput.Armour:" .. build.calcsTab.mainOutput.Armour)
 
 		build.configTab.input.customMods = [[
 			Armour from Equipped Body Armour is doubled
@@ -955,7 +1013,6 @@ describe("TestDefence", function()
 		]]
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
-
 		-- Evasion from Body Armour is converted to Armour before being doubled
 		assert.are.equals(2*ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
@@ -967,25 +1024,21 @@ describe("TestDefence", function()
 		]]
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
-
 		-- Only the base armour from the chest is affected.
 		-- Armour converted with Iron Reflexes still applies
-		assert.are.equals(2*ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
+		assert.are.equals(baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
+
 		build.configTab.input.customMods = [[
 			Armour from Equipped Body Armour is doubled
 			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
-			Gain no armour from equipped body armour
 			defences from equipped body armour are doubled if it has no socketed gems
 			you have no dexterity
 		]]
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
-
-		-- Oath Of Maji double defences stack with Unbreakable
 		assert.are.equals(2*2*ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
 		build.configTab.input.customMods = [[
-			Armour from Equipped Body Armour is doubled
 			Armour from Equipped Body Armour is doubled
 			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
 			Gain no armour from equipped body armour
@@ -994,7 +1047,17 @@ describe("TestDefence", function()
 		]]
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
+		assert.are.equals(baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
+		build.configTab.input.customMods = [[
+			Armour from Equipped Body Armour is doubled
+			Armour from Equipped Body Armour is doubled
+			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
+			defences from equipped body armour are doubled if it has no socketed gems
+			you have no dexterity
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
 		-- Mod form unbreakable should apply only once
 		assert.are.equals(2*2*ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
@@ -1004,14 +1067,37 @@ describe("TestDefence", function()
 			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
 			Gain no armour from equipped body armour
 			defences from equipped body armour are doubled if it has no socketed gems
-			defences from equipped body armour are doubled if it has no socketed gems
 			you have no dexterity
 		]]
 		build.configTab:BuildModList()
 		runCallback("OnFrame")
+		assert.are.equals(baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 
+		build.configTab.input.customMods = [[
+			Armour from Equipped Body Armour is doubled
+			Armour from Equipped Body Armour is doubled
+			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
+			defences from equipped body armour are doubled if it has no socketed gems
+			defences from equipped body armour are doubled if it has no socketed gems
+			you have no dexterity
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
 		-- Oath Of Maji should apply only once
 		assert.are.equals(2*2*ironReflexesArmour + baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
+
+		build.configTab.input.customMods = [[
+			Armour from Equipped Body Armour is doubled
+			Armour from Equipped Body Armour is doubled
+			Converts all Evasion Rating to Armour. Dexterity provides no bonus to Evasion Rating
+			Gain no armour from equipped body armour
+			defences from equipped body armour are doubled if it has no socketed gems
+			defences from equipped body armour are doubled if it has no socketed gems
+			you have no dexterity
+		]]
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		assert.are.equals(baseArmour + baseEvasion, build.calcsTab.mainOutput.Armour)
 	end)
 
 	it("MoM + EB", function()

spec/System/TestItemTools_spec.lua

@@ -45,4 +45,42 @@ describe("TestItemTools", function()
 			assert.are.equals(expected, result)
 		end)
 	end
-end)
+
+	it("uses the displayed item slot for anoint comparison tooltips", function()
+		if not common.classes.ItemsTab then
+			LoadModule("Classes/ItemsTab")
+		end
+		local item = new("Item", [[
+Rarity: Rare
+Dire Thread
+Cord Belt
+Can be Anointed
+]])
+		local overrides = { }
+		local fakeItemsTab = setmetatable({
+			displayItem = item,
+			build = {
+				spec = { allocNodes = { } },
+				calcsTab = {
+					GetMiscCalculator = function()
+						return function(override)
+							table.insert(overrides, override)
+							return { }
+						end
+					end,
+				},
+				AddStatComparesToTooltip = function()
+					return 1
+				end,
+			},
+		}, common.classes.ItemsTab)
+		local tooltip = {
+			AddLine = function() end,
+		}
+
+		fakeItemsTab:AppendAnointTooltip(tooltip, { id = 1, dn = "Acrimony" })
+
+		assert.are.equals("Belt", overrides[1].repSlotName)
+		assert.are.equals("Belt", overrides[2].repSlotName)
+	end)
+end)

spec/System/TestSkills_spec.lua

@@ -100,6 +100,38 @@ describe("TestAttacks", function()
 		assert.True(build.calcsTab.mainEnv.enemyDB:Sum("BASE", nil, "FireResist") < 0)
 	end)
 
+	it("Defaults Blade Blast to the skill's blade cap", function()
+		build.skillsTab:PasteSocketGroup("Blade Blast 20/0  1\n")
+		runCallback("OnFrame")
+
+		local mainSocketGroup = build.skillsTab.socketGroupList[build.mainSocketGroup]
+		local activeSkill = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill]
+		local calcsSkillSelectControls = build.calcsTab.sectionList[1].controls
+		build:RefreshSkillSelectControls(calcsSkillSelectControls, build.calcsTab.input.skill_number, "Calcs")
+
+		assert.are.equals("50", build.controls.mainSkillStageCount.buf)
+		assert.are.equals("50", calcsSkillSelectControls.mainSkillStageCount.buf)
+		assert.are.equals(50, activeSkill.skillData.stagesMax)
+		assert.are.equals(50, activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BladeBlastStage"))
+		assert.are.equals(49, activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BladeBlastStageAfterFirst"))
+
+		local cappedAverageDamage = build.calcsTab.mainOutput.AverageDamage
+		local cappedTotalDPS = build.calcsTab.mainOutput.TotalDPS
+		local cappedCombinedDPS = build.calcsTab.mainOutput.CombinedDPS
+		activeSkill.activeEffect.srcInstance.skillStageCount = 51
+		build.modFlag = true
+		build.buildFlag = true
+		runCallback("OnFrame")
+
+		activeSkill = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill]
+		assert.are.equals("51", build.controls.mainSkillStageCount.buf)
+		assert.are.equals(50, activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BladeBlastStage"))
+		assert.are.equals(49, activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BladeBlastStageAfterFirst"))
+		assert.are.equals(cappedAverageDamage, build.calcsTab.mainOutput.AverageDamage)
+		assert.are.equals(cappedTotalDPS, build.calcsTab.mainOutput.TotalDPS)
+		assert.are.equals(cappedCombinedDPS, build.calcsTab.mainOutput.CombinedDPS)
+	end)
+
 	it("Test Adrenaline affecting blight max stage count", function()
 		build.skillsTab:PasteSocketGroup("Blight 20/0  1\n")
 		runCallback("OnFrame")

spec/System/TestTreeTab_spec.lua

@@ -0,0 +1,63 @@
+describe("TreeTab", function()
+	local originalClusterNodeMap
+	local originalMasteryEffects
+
+	before_each(function()
+		newBuild()
+		originalClusterNodeMap = build.spec.tree.clusterNodeMap
+		originalMasteryEffects = build.spec.tree.masteryEffects
+	end)
+
+	after_each(function()
+		build.spec.tree.clusterNodeMap = originalClusterNodeMap
+		build.spec.tree.masteryEffects = originalMasteryEffects
+	end)
+
+	it("adds separate power report entries for mastery effects", function()
+		local treeTab = build.treeTab
+		local parentNode = { id = 2 }
+		local masteryNode = {
+			id = 1,
+			type = "Mastery",
+			dn = "Two Hand Mastery",
+			power = {
+				masteryEffects = {
+					[101] = { singleStat = 10, pathPower = 10 },
+					[102] = { singleStat = 20, pathPower = 20 },
+				},
+			},
+			masteryEffects = {
+				{ effect = 101 },
+				{ effect = 102 },
+			},
+			path = { parentNode, false },
+			x = 10,
+			y = 20,
+		}
+		masteryNode.path[2] = masteryNode
+
+		treeTab.build.displayStats = {
+			{ stat = "Damage", label = "Damage", fmt = ".1f" },
+		}
+		treeTab.build.spec.nodes = {
+			[masteryNode.id] = masteryNode,
+		}
+		treeTab.build.spec.masterySelections = { }
+		treeTab.build.spec.tree.clusterNodeMap = { }
+		treeTab.build.spec.tree.masteryEffects = {
+			[101] = { id = 101, sd = { "Gain 10 Damage" }, stats = { "Gain 10 Damage" } },
+			[102] = { id = 102, sd = { "Gain 20 Damage" }, stats = { "Gain 20 Damage" } },
+		}
+		treeTab.build.calcsTab.mainEnv = { grantedPassives = { } }
+
+		local report = treeTab:BuildPowerReportList({ stat = "Damage", label = "Damage" })
+
+		assert.are.same(2, #report)
+		assert.are.same("Mastery", report[1].type)
+		assert.are.same("Two Hand Mastery: Gain 20 Damage", report[1].name)
+		assert.are.same(20, report[1].power)
+		assert.are.same(2, report[1].pathDist)
+		assert.are.same(10, report[2].power)
+		assert.are.same("Two Hand Mastery: Gain 10 Damage", report[2].name)
+	end)
+end)