Merge branch 'dev' into item-origin

Author: LocalIdentity

spec/System/TestAttacks_spec.lua

@@ -167,6 +167,113 @@ describe("TestAttacks", function()
 		assert.are.equals(1.1, build.calcsTab.mainOutput.MainHand.AverageHit)
 	end)
 
+	it("matches in-game tooltip DPS for low-level spear skills", function()
+		build.spec:SelectClass(build.spec.tree.classNameMap.Huntress)
+		build.characterLevel = 11
+		build.characterLevelAutoMode = false
+		build.controls.characterLevel:SetText(11)
+		build.configTab.input.customMods = [[
+			10% increased Attack Damage
+			+10000 to Accuracy Rating
+			nearby enemies have 100% less armour
+			nearby enemies have 100% less evasion
+		]]
+		build.configTab:BuildModList()
+		build.itemsTab:CreateDisplayItemFromRaw([[
+			Apocalypse Edge
+			Ironhead Spear
+			Item Level: 7
+			Quality: 0
+			LevelReq: 5
+			Implicits: 1
+			Grants Skill: Spear Throw
+			Adds 2 to 4 Physical Damage
+		]])
+		build.itemsTab:AddDisplayItem()
+
+		local skills = {
+			{ gemId = "Metadata/Items/Gems/SkillGemPlayerDefaultSpear", level = 4, dps = 32.8 },
+			{ gemId = "Metadata/Items/Gems/SkillGemWhirlingSlash", level = 1, dps = 11.8 },
+			{ gemId = "Metadata/Items/Gems/SkillGemPlayerDefaultSpearThrow", level = 4, dps = 28.8 },
+			{ gemId = "Metadata/Items/Gems/SkillGemTwister", level = 2, dps = 17.5 },
+		}
+		for _, skill in ipairs(skills) do
+			local group = {
+				enabled = true,
+				gemList = { {
+					gemId = skill.gemId,
+					level = skill.level,
+					quality = 0,
+					enabled = true,
+					count = 1,
+					enableGlobal1 = true,
+					enableGlobal2 = true,
+				} },
+			}
+			table.insert(build.skillsTab.socketGroupList, group)
+			build.skillsTab:ProcessSocketGroup(group)
+			skill.groupIndex = #build.skillsTab.socketGroupList
+		end
+
+		for _, skill in ipairs(skills) do
+			local group = build.skillsTab.socketGroupList[skill.groupIndex]
+			build.mainSocketGroup = skill.groupIndex
+			build.calcsTab.input.skill_number = skill.groupIndex
+			group.mainActiveSkill = 1
+			group.mainActiveSkillCalcs = 1
+			build.buildFlag = true
+			build.modFlag = true
+			runCallback("OnFrame")
+			build.calcsTab:BuildOutput()
+			runCallback("OnFrame")
+
+			assert.are.equals(skill.dps, round(build.calcsTab.mainOutput.TotalDPS, 1))
+		end
+	end)
+
+	it("correctly calculates Garukhan's Resolve bifurcated critical hit damage", function()
+		local function setup(socketGroup)
+			newBuild()
+			build.itemsTab:CreateDisplayItemFromRaw([[
+				New Item
+				Razor Quarterstaff
+				Quality: 0
+				This Weapon's Critical Hit Chance is 0%
+				-100% increased physical damage
+				adds 1 to 1 physical damage to attacks
+				nearby enemies have 100% less armour
+				nearby enemies have 100% less evasion
+			]])
+			build.itemsTab:AddDisplayItem()
+			runCallback("OnFrame")
+			build.skillsTab:PasteSocketGroup(socketGroup)
+			runCallback("OnFrame")
+
+			build.configTab.input.customMods = [[
+				+50% to critical hit chance
+				your critical damage bonus is 1000000%
+				+4000 to accuracy
+			]]
+			build.configTab:BuildModList()
+			runCallback("OnFrame")
+			build.calcsTab:BuildOutput()
+			runCallback("OnFrame")
+
+			return build.calcsTab.mainOutput.MainHand
+		end
+
+		local normalOutput = setup("Quarterstaff Strike 1/0  1")
+		assert.are.equals(50, normalOutput.CritChance)
+		assert.are.equals(10001, normalOutput.CritMultiplier)
+		assert.are.equals(5001, normalOutput.AverageHit)
+
+		local garukhanOutput = setup("Quarterstaff Strike 1/0  1\nGarukhan's Resolve 1/0  1")
+		assert.are.equals(50, garukhanOutput.PreBifurcateCritChance)
+		assert.are.equals(75, garukhanOutput.CritChance)
+		assert.is_true(math.abs(1 / 3 - (garukhanOutput.CritBifurcates - 1)) < 0.000001)
+		assert.is_true(math.abs(10001 - garukhanOutput.AverageHit) < 0.01)
+	end)
+
 	it("correctly adds damage with oracle forced outcome", function()
 		-- Setup: Add weapon with no crit chance, and strip enemy defenses
 		build.itemsTab:CreateDisplayItemFromRaw([[

spec/System/TestDebuffs_spec.lua

@@ -0,0 +1,71 @@
+describe("TestAilments", function()
+	before_each(function()
+		newBuild()
+	end)
+
+	teardown(function()
+		-- newBuild() takes care of resetting everything in setup()
+	end)
+
+	it("correctly applies effects dependent on 'Condition:Slowed'", function()
+		build.skillsTab:PasteSocketGroup("Chaos Bolt 1/0  1\n")
+		runCallback("OnFrame")
+
+		local defaultDmg = build.calcsTab.mainOutput.TotalDPS
+		assert.True(defaultDmg > 0, "build should deal damage")
+		
+		build.configTab.input.customMods = "100% increased damage against slowed enemies"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		
+		-- no effect yet
+		local nonSlowedDmg = build.calcsTab.mainOutput.TotalDPS
+		assert.are.equals(nonSlowedDmg, defaultDmg, "damage should be unchanged until enemy is slowed")
+		
+		-- action speed
+		build.configTab.input.customMods = [[
+			100% increased damage against slowed enemies
+			Nearby enemies have 10% reduced action speed
+		]]
+			
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		local actionSlowedDmg = build.calcsTab.mainOutput.TotalDPS
+		assert.True(actionSlowedDmg > nonSlowedDmg, "damage should be higher vs. reduced action speed")
+
+		-- movement speed
+		build.configTab.input.customMods = [[
+			100% increased damage against slowed enemies
+			Nearby enemies have 10% reduced movement speed
+		]]
+			
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		local movementSlowedDmg = build.calcsTab.mainOutput.TotalDPS
+		assert.True(movementSlowedDmg > nonSlowedDmg, "damage should be higher vs. reduced movement speed")
+
+		-- specific slowing debuffs checks
+		-- NOTE: there might be more conditions that should be checked here, feel free to add more
+		for _, debuff in ipairs({"chilled", "maimed", "hindered"}) do
+			build.configTab.input.customMods = [[
+				100% increased damage against slowed enemies
+				nearby enemies are ]] .. debuff .. [[
+			]]
+			
+			build.configTab:BuildModList()
+			runCallback("OnFrame")
+			local debuffSlowedDmg = build.calcsTab.mainOutput.TotalDPS
+			assert.True(debuffSlowedDmg > nonSlowedDmg, "damage should be higher vs. " .. debuff .. " enemies")
+		end
+
+		-- temporal chains curse
+		build.configTab.input.customMods = [[
+			100% increased damage against slowed enemies
+		]]
+		build.skillsTab:PasteSocketGroup("Temporal Chains 20/0  1\n")
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+		local temporalChainsSlowedDmg = build.calcsTab.mainOutput.TotalDPS
+		assert.True(temporalChainsSlowedDmg > nonSlowedDmg, "damage should be higher with Temporal Chains curse")
+	end)
+end)

spec/System/TestImportTab_spec.lua

@@ -43,6 +43,59 @@ describe("ImportTab", function()
 		assert.are.equals(1, #importTab.controls.charSelect.list)
 		assert.True(importTab.controls.charSelect.list[1].detail:match("Future Ascendancy") ~= nil)
 	end)
+
+	it("imports Split Personality alternate class start from character JSON", function()
+		local spec = build.spec
+		local socketNode = spec.nodes[60735]
+		local rangerStartPassive = spec.nodes[56651]
+		assert.is_not_nil(socketNode)
+		assert.is_not_nil(rangerStartPassive)
+
+		local hashes = { socketNode.id, rangerStartPassive.id }
+		for _, pathNode in ipairs(socketNode.path or { }) do
+			table.insert(hashes, pathNode.id)
+		end
+
+		local rangerStart = spec.nodes[spec.tree.classes[spec.tree.classNameMap.Ranger].startNodeId]
+		local importPayload = {
+			name = "Split Import Test",
+			class = "Witch2",
+			league = "Test",
+			level = 90,
+			jewels = {
+				{
+					id = "split-personality-test",
+					frameType = 3,
+					name = "Split Personality",
+					typeLine = "Ruby",
+					inventoryId = "PassiveJewels",
+					x = 4,
+					ilvl = 84,
+					properties = { },
+					explicitMods = {
+						"Can Allocate Passive Skills from the Ranger's starting point",
+					},
+				},
+			},
+			passives = {
+				hashes = hashes,
+				specialisations = { },
+				skill_overrides = { },
+				jewel_data = { },
+				quest_stats = { },
+			},
+		}
+
+		build.importTab:ImportPassiveTreeAndJewels(importPayload)
+
+		local importedSpec = build.spec
+		local importedJewel = build.itemsTab.items[importedSpec.jewels[socketNode.id]]
+		assert.are.equals("Ranger", importedJewel.jewelData.alternateClassStart)
+
+		assert.are.equals(0, importedSpec.nodes[rangerStart.id].pathDist)
+		assert.True(importedSpec.nodes[rangerStartPassive.id].alloc)
+		assert.True(importedSpec.nodes[rangerStartPassive.id].connectedToStart)
+	end)
 end)
 
 describe("ImportTab quest reward import", function()

spec/System/TestSkills_spec.lua

@@ -118,7 +118,7 @@ describe("TestSkills", function()
 
 		local normalArmour = env.player.output.Armour
 		local normalDPS = env.player.output.TotalDPS
-		assert.are.equals(1050, normalArmour)
+		assert.are.equals(1200, normalArmour)
 		assert.is_true(normalDPS > 0)
 
 		env = calcs.initEnv(build, "CALCULATOR", {}, {
@@ -354,15 +354,27 @@ describe("TestSkills", function()
 		assert.True(baseLeapSlamHit < build.calcsTab.mainOutput.AverageDamage)
 	end)
 
-	it("applies minion offensive multiplier to all attack damage", function()
+	it("applies generated minion offensive multiplier to 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))
+		local expectedPhysicalMax = floor(floor(build.calcsTab.mainEnv.data.monsterAllyDamageTable[minion.level]) * minion.minionData.damage * (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)
+		assert.are.near(-30, minion.mainSkill.skillModList:Sum("MORE", minion.mainSkill.skillCfg, "AddedDamage"), 0.0001)
+		assert.are.equals(0, minion.mainSkill.skillModList:Sum("MORE", minion.mainSkill.skillCfg, "Damage"))
+	end)
+
+	it("does not apply minion offensive multiplier to spectre or companion added damage", function()
+		for _, skill in ipairs({ "Spectre: Lightless Abomination 20/0  1", "Companion: Lightless Abomination 20/0  1" }) do
+			newBuild()
+			build.skillsTab:PasteSocketGroup(skill)
+			runCallback("OnFrame")
+
+			local minion = build.calcsTab.mainEnv.minion
+			assert.are.equals(0, minion.mainSkill.skillModList:Sum("MORE", minion.mainSkill.skillCfg, "AddedDamage"))
+		end
 	end)
 
 	it("Inspiring Ally only mirrors companion damage, not generic minion damage", function()
@@ -1106,4 +1118,5 @@ describe("TestSkills", function()
 		local noParrySpellDmg = build.calcsTab.mainOutput.AverageDamage
 		assert.equals(withParrySpellDmg, noParrySpellDmg, "Parry should not affect spell damage")
 	end)
+	
 end)

src/Classes/CalcBreakdownControl.lua

@@ -275,7 +275,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 	-- Build list of modifiers to display
 	local cfg = (sectionData.cfg and actor.mainSkill[sectionData.cfg.."Cfg"] and copyTable(actor.mainSkill[sectionData.cfg.."Cfg"], true)) or { }
 	cfg.source = sectionData.modSource
-	cfg.ignoreSourceinCheckConditions = true
+	cfg.ignoreSourceInCheckConditions = true
 	cfg.actor = sectionData.actor
 	local rowList
 	local modStore = (sectionData.enemy and actor.enemy.modDB) or (sectionData.cfg and actor.mainSkill.skillModList) or actor.modDB

src/Classes/CalcSectionControl.lua

@@ -190,7 +190,7 @@ function CalcSectionClass:FormatStr(str, actor, colData)
 			local modCfg = (sectionData.cfg and actor.mainSkill[sectionData.cfg.."Cfg"]) or { }
 			if sectionData.modSource then
 				modCfg.source = sectionData.modSource
-				modCfg.ignoreSourceinCheckConditions = true
+				modCfg.ignoreSourceInCheckConditions = true
 			end
 			if sectionData.actor then
 				modCfg.actor = sectionData.actor

src/Classes/Item.lua

@@ -902,6 +902,9 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 					-- Replace non-number ranges as unsupported
 					line = line:gsub("(%a+)%([%a%s]+%-[%a%s]+%)", "%1")
 
+					-- Strip single values like 25(50) -> 25
+					line = line:gsub("(%d+)%((%d+)%)", "%1")
+
 					for value, range in line:gmatch("(%-?%d+%.?%d*)%((%-?%d+%.?%d*%-%-?%d+%.?%d*)%)") do
 						local min, max = range:match("(%-?%d+%.?%d*)%-(%-?%d+%.?%d*)")
 						local delta = tonumber(max) - min
@@ -1895,6 +1898,9 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		for _, value in ipairs(modList:List(nil, "JewelData")) do
 			jewelData[value.key] = value.value
 		end
+		for _, className in ipairs(modList:List(nil, "AlternateClassStart")) do
+			jewelData.alternateClassStart = className
+		end
 		if modList:List(nil, "FromNothingKeystones") then
 			jewelData.fromNothingKeystones = { }
 			for _, value in ipairs(modList:List(nil, "FromNothingKeystones")) do

src/Classes/ModDB.lua

@@ -198,7 +198,7 @@ function ModDBClass:FlagInternal(context, cfg, flags, keywordFlags, source, ...)
 		if modList then
 			for i = 1, #modList do
 				local mod = modList[i]
-				local checkSource = not cfg or not cfg.ignoreSourceinCheckConditions
+				local checkSource = not cfg or not cfg.ignoreSourceInCheckConditions
 				if mod.type == "FLAG" and band(flags, mod.flags) == mod.flags and MatchKeywordFlags(keywordFlags, mod.keywordFlags) and (not checkSource or not source or mod.source:match("[^:]+") == source) then
 					if mod[1] then
 						if context:EvalMod(mod, cfg) then

src/Classes/ModStore.lua

@@ -176,6 +176,23 @@ function ModStoreClass:SumPositiveValues(modType, cfg, modName, ...)
 	return total
 end
 
+--- Returns the value of all negative modifiers to a mod added together, ignoring any negative modifiers.
+--- Works by creating a table using Tabulate and then filtering for negative values.
+---
+--- @param modType string # the mod type for which we want to create the table, e.g. "INC" or "MORE"
+--- @param cfg table | nil # passed configuration, may be nil
+--- @param modName string # the name of the mod for which we want to create the table, e.g. "FlaskRecoveryRate", "ActionSpeed", ...
+function ModStoreClass:SumNegativeValues(modType, cfg, modName, ...)
+	local total = 0
+	local modTable = self:Tabulate(modType, cfg, modName)
+	for i = 1, #modTable do
+		if modTable[i].value < 0 then
+			total = total + modTable[i].value
+		end
+	end
+	return total
+end
+
 function ModStoreClass:More(cfg, ...)
 	local flags, keywordFlags = 0, 0
 	local source

src/Classes/PartyTab.lua

@@ -371,7 +371,7 @@ local PartyTabClass = newClass("PartyTab", "ControlHost", "Control", function(se
 		self:ParseBuffs(self.enemyModList, self.controls.enemyMods.buf, "EnemyMods", self.controls.simpleEnemyMods)
 		self.build.buildFlag = true 
 	end)
-	self.controls.rebuild.tooltipText = "^7Reparse all the inputs incase they have been disabled or they have changed since loading the build or importing"
+	self.controls.rebuild.tooltipText = "^7Reparse all the inputs in case they have been disabled or they have changed since loading the build or importing"
 	self.controls.rebuild.x = function()
 		return (self.width > theme.widthThreshold1) and 8 or (-328)
 	end