Merge branch 'PathOfBuildingCommunity:dev' into dev

Author: vaisest

.busted

@@ -1,6 +1,6 @@
 return {
     _all = {
-        coverage = true,
+        coverage = false,
         verbose = true,
     },
     default = {

.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Accuracy bug report
 description: Create a bug report to help us fix incorrect wording in Path of Building for PoE1.
-labels: ["bug:accuracy"]
+labels: ["bug: accuracy"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Behaviour bug report
 description: Create a bug report to help us fix incorrect behaviour or logic in Path of Building for PoE1.
-labels: ["bug:behaviour"]
+labels: ["bug: behaviour"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/calculation_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Calculation bug report
 description: Create a bug report to help us fix incorrect calculations in Path of Building for PoE1.
-labels: ["bug:calculation"]
+labels: ["bug: calculation"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Run tests
-        run: busted --lua=luajit --no-coverage
+        run: busted --lua=luajit
   check_modcache:
     runs-on: ubuntu-latest
     container: ghcr.io/pathofbuildingcommunity/pathofbuilding-tests:latest

src/Classes/ConfigTab.lua

@@ -168,7 +168,7 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
 					self.build.buildFlag = true
 				end)
 			elseif varData.type == "count" or varData.type == "integer" or varData.type == "countAllowZero" or varData.type == "float" then
-				control = new("EditControl", {"TOPLEFT",lastSection,"TOPLEFT"}, {234, 0, 90, 18}, "", nil, (varData.type == "integer" and "^%-%d") or (varData.type == "float" and "^%d.") or "%D", 7, function(buf, placeholder)
+				control = new("EditControl", {"TOPLEFT",lastSection,"TOPLEFT"}, {234, 0, 90, 18}, "", nil, (varData.type == "integer" and "^%-%d") or (varData.type == "float" and "^%d.") or "%D", 10, function(buf, placeholder)
 					if placeholder then
 						self.configSets[self.activeConfigSetId].placeholder[varData.var] = tonumber(buf)
 					else

src/Data/Gems.lua

@@ -2057,27 +2057,6 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemPhaseRun"] = {
-		name = "Phase Run",
-		baseTypeName = "Phase Run",
-		gameId = "Metadata/Items/Gems/SkillGemPhaseRun",
-		variantId = "PhaseRun",
-		grantedEffectId = "PhaseRun",
-		tags = {
-			dexterity = true,
-			grants_active_skill = true,
-			spell = true,
-			duration = true,
-			movement = true,
-			physical = true,
-			travel = true,
-		},
-		tagString = "Spell, Duration, Movement, Physical, Travel",
-		reqStr = 0,
-		reqDex = 100,
-		reqInt = 0,
-		naturalMaxLevel = 20,
-	},
 	["Metadata/Items/Gems/SkillGemSupportMeleePhysicalDamage"] = {
 		name = "Melee Physical Damage",
 		gameId = "Metadata/Items/Gems/SupportGemMeleePhysicalDamage",
@@ -4174,25 +4153,6 @@ return {
 		reqInt = 40,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemArcticArmour"] = {
-		name = "Arctic Armour",
-		baseTypeName = "Arctic Armour",
-		gameId = "Metadata/Items/Gems/SkillGemArcticArmour",
-		variantId = "ArcticArmour",
-		grantedEffectId = "ArcticArmour",
-		tags = {
-			dexterity = true,
-			grants_active_skill = true,
-			spell = true,
-			duration = true,
-			cold = true,
-		},
-		tagString = "Spell, Duration, Cold",
-		reqStr = 0,
-		reqDex = 60,
-		reqInt = 40,
-		naturalMaxLevel = 20,
-	},
 	["Metadata/Items/Gems/SkillGemVaalArcticArmour"] = {
 		name = "Vaal Arctic Armour",
 		baseTypeName = "Vaal Arctic Armour",
@@ -6327,27 +6287,6 @@ return {
 		reqInt = 100,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemLightningTendrils"] = {
-		name = "Lightning Tendrils",
-		baseTypeName = "Lightning Tendrils",
-		gameId = "Metadata/Items/Gems/SkillGemLightningTendrilsChannelled",
-		variantId = "LightningTendrils",
-		grantedEffectId = "LightningTendrils",
-		tags = {
-			critical = true,
-			intelligence = true,
-			grants_active_skill = true,
-			spell = true,
-			area = true,
-			lightning = true,
-			channelling = true,
-		},
-		tagString = "Critical, Spell, AoE, Lightning, Channelling",
-		reqStr = 0,
-		reqDex = 0,
-		reqInt = 100,
-		naturalMaxLevel = 1,
-	},
 	["Metadata/Items/Gems/SkillGemKineticBlast"] = {
 		name = "Kinetic Blast",
 		baseTypeName = "Kinetic Blast",

src/Data/ModCache.lua

@@ -7687,38 +7687,16 @@ skills["MoltenStrike"] = {
 			t_insert(breakdown.OverlapChance, s_format("^8=^7 %.2f^8%%", output.OverlapChance))
 		end
 
-		local numProjectiles = skillModList:Sum("BASE", skillCfg, "ProjectileCount")
+		local numProjectiles = output.ProjectileCount
 		local dpsMult = 1
-		if skillPart == 3 or skillPart == 5 or skillPart == 6 then
+		if skillPart == 3 then
 			dpsMult = overlapChance * numProjectiles
-
-			if skillPart ~= 6 then
-				if breakdown then
-					breakdown.SkillDPSMultiplier = {}
-					t_insert(breakdown.SkillDPSMultiplier, "DPS multiplier")
-					t_insert(breakdown.SkillDPSMultiplier, "^8= number of projectiles * overlap chance")
-					t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %d^8 *^7 %.3f^8", numProjectiles, overlapChance))
-					t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %.3f", dpsMult))
-				end
-			else
-				-- zenith: make an effective dpsMult for the weighted average of normal and 5th attack balls
-				local gemQuality = activeSkill.activeEffect.quality
-				local fifthAttackMulti = 1 + 8 + 0.1 * gemQuality
-				local fifthAttackOverallMulti = fifthAttackMulti * overlapChance * (numProjectiles + 5)
-				dpsMult = 0.8 * dpsMult + 0.2 * fifthAttackOverallMulti
-
-				if breakdown then
-					breakdown.SkillDPSMultiplier = {}
-					t_insert(breakdown.SkillDPSMultiplier, "Weighted average DPS multiplier for balls")
-					t_insert(breakdown.SkillDPSMultiplier, "^8= (0.8 * balls dps) + (0.2 * 5th attack balls dps)")
-					t_insert(breakdown.SkillDPSMultiplier, "^8= (0.8 * normal ball hit * overlap chance * number of projectiles) " ..
-						"+ (0.2 * ball hit * 5th attack multiplier * overlap chance * (number of projectiles + 5))")
-					t_insert(breakdown.SkillDPSMultiplier, "^8= ball hit * overlap chance * (0.8 * number of projectiles " ..
-						"+ 0.2 * 5th attack multiplier * (number of projectiles + 5))")
-					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= ball hit * ^7%.3f ^8* (0.8 * ^7%d ^8+ 0.2 * ^7%.1f ^8* ^7%d^8)",
-						overlapChance, numProjectiles, fifthAttackMulti, numProjectiles + 5))
-					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= ball hit * ^7 %.3f", dpsMult))
-				end
+			if breakdown then
+				breakdown.SkillDPSMultiplier = {}
+				t_insert(breakdown.SkillDPSMultiplier, "DPS multiplier")
+				t_insert(breakdown.SkillDPSMultiplier, "^8= number of projectiles * overlap chance")
+				t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %d^8 *^7 %.3f^8", numProjectiles, overlapChance))
+				t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %.3f", dpsMult))
 			end
 		end
 		if dpsMult ~= 1 then
@@ -7856,16 +7834,89 @@ skills["MoltenStrikeAltX"] = {
 			area = true,
 		},
 	},
-	preDamageFunc = skills.MoltenStrike.preDamageFunc,
+	preDamageFunc = function(activeSkill, output, breakdown)
+		local skillCfg = activeSkill.skillCfg
+		local skillData = activeSkill.skillData
+		local skillPart = activeSkill.skillPart
+		local skillModList = activeSkill.skillModList
+		local t_insert = table.insert
+		local s_format = string.format
+
+		-- melee part doesn't need to calc balls
+		if skillPart == 1 then
+			return
+		end
+
+		local enemyRadius = skillModList:Override(skillCfg, "EnemyRadius") or skillModList:Sum("BASE", skillCfg, "EnemyRadius")
+		local ballRadius = output.AreaOfEffectRadius
+		local innerRadius = output.AreaOfEffectRadiusSecondary
+		local outerRadius = output.AreaOfEffectRadiusTertiary
+
+		-- logic adapted from MoldyDwarf's calculator
+		local hitRange = enemyRadius + ballRadius - innerRadius
+		local landingRange = outerRadius - innerRadius
+		local overlapChance = math.min(1, hitRange / landingRange)
+		output.OverlapChance = overlapChance * 100
+
+		if breakdown then
+			breakdown.OverlapChance = { }
+			t_insert(breakdown.OverlapChance, "Chance for individual balls to land on the enemy:")
+			t_insert(breakdown.OverlapChance, "^8= (area where a ball can land on enemy) / (total area)")
+			t_insert(breakdown.OverlapChance, "^8= (enemy radius + ball radius - min travel) / (max travel - min travel)")
+			t_insert(breakdown.OverlapChance, s_format("^8= (^7%d^8 + ^7%d^8 - ^7%d) / (^7%d^8 - ^7%d)",
+				enemyRadius, ballRadius, innerRadius, outerRadius, innerRadius))
+			t_insert(breakdown.OverlapChance, s_format("^8=^7 %.2f^8%%", output.OverlapChance))
+		end
+
+		local numProjectiles = output.ProjectileCount
+		local dpsMult = 1
+		if skillPart == 3 or skillPart == 5 or skillPart == 6 then
+			dpsMult = overlapChance * numProjectiles
+
+			if skillPart ~= 6 then
+				if breakdown then
+					breakdown.SkillDPSMultiplier = {}
+					t_insert(breakdown.SkillDPSMultiplier, "DPS multiplier")
+					t_insert(breakdown.SkillDPSMultiplier, "^8= number of projectiles * overlap chance")
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %d^8 *^7 %.3f^8", numProjectiles, overlapChance))
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8=^7 %.3f", dpsMult))
+				end
+			else
+				-- zenith: make an effective dpsMult for the weighted average of normal and 5th attack balls
+				local fifthAttackMulti = 1 + skillData.FifthStrikeDamage / 100
+				local fifthAttackOverallMulti = fifthAttackMulti * overlapChance * (numProjectiles + skillData.FifthStrikeProjectiles)
+				dpsMult = 0.8 * dpsMult + 0.2 * fifthAttackOverallMulti
+
+				if breakdown then
+					breakdown.SkillDPSMultiplier = {}
+					t_insert(breakdown.SkillDPSMultiplier, "Weighted average DPS multiplier for balls")
+					t_insert(breakdown.SkillDPSMultiplier, "^8= (0.8 * balls dps) + (0.2 * 5th attack balls dps)")
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= (0.8 * normal ball hit * overlap chance * number of projectiles) " ..
+						"+ (0.2 * ball hit * 5th attack multiplier * overlap chance * (number of projectiles + %d))", skillData.FifthStrikeProjectiles))
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= ball hit * overlap chance * (0.8 * number of projectiles " ..
+						"+ 0.2 * 5th attack multiplier * (number of projectiles + %d))", skillData.FifthStrikeProjectiles))
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= ball hit * ^7%.3f ^8* (0.8 * ^7%d ^8+ 0.2 * ^7%.1f ^8* ^7%d^8)",
+						overlapChance, numProjectiles, fifthAttackMulti, numProjectiles + skillData.FifthStrikeProjectiles))
+					t_insert(breakdown.SkillDPSMultiplier, s_format("^8= ball hit * ^7 %.3f", dpsMult))
+				end
+			end
+		end
+		if dpsMult ~= 1 then
+			skillData.dpsMultiplier = (skillData.dpsMultiplier or 1) * dpsMult
+			output.SkillDPSMultiplier = (output.SkillDPSMultiplier or 1) * dpsMult
+		end
+	end,
 	statMap = {
 		["active_skill_hit_ailment_damage_with_projectile_+%_final"] = {
 			mod("Damage", "MORE", nil, bit.band(ModFlag.Hit, ModFlag.Ailment), 0, { type = "SkillPart", skillPartList = { 2, 3, 4, 5, 6 } })
 		},
 		["molten_strike_every_5th_attack_projectiles_damage_+%_final"] = {
-			mod("Damage", "MORE", nil, bit.band(ModFlag.Hit, ModFlag.Ailment), 0, { type = "SkillPart", skillPartList = { 4, 5 } })
+			mod("Damage", "MORE", nil, bit.band(ModFlag.Hit, ModFlag.Ailment), 0, { type = "SkillPart", skillPartList = { 4, 5 } }),
+			skill("FifthStrikeDamage", nil),
 		},
 		["molten_strike_every_5th_attack_fire_X_additional_projectiles"] = {
-			mod("ProjectileCount", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 4, 5 } })
+			mod("ProjectileCount", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 4, 5 } }),
+			skill("FifthStrikeProjectiles", nil),
 		},
 	},
 	baseFlags = {