Merge branch 'dev' of https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2 into dev

Author: Wires77

src/Data/Skills/act_int.lua

@@ -12546,9 +12546,6 @@ skills["PurityOfFirePlayer"] = {
 				aura = true,
 				area = true,
 			},
-			baseMods = {
-				skill("auraCannotAffectSelf", true),
-			},
 			constantStats = {
 				{ "skill_desired_amount_override", 1 },
 			},
@@ -12669,9 +12666,6 @@ skills["PurityOfIcePlayer"] = {
 				aura = true,
 				area = true,
 			},
-			baseMods = {
-				skill("auraCannotAffectSelf", true),
-			},
 			constantStats = {
 				{ "skill_desired_amount_override", 1 },
 			},
@@ -12792,9 +12786,6 @@ skills["PurityOfLightningPlayer"] = {
 				aura = true,
 				area = true,
 			},
-			baseMods = {
-				skill("auraCannotAffectSelf", true),
-			},
 			constantStats = {
 				{ "skill_desired_amount_override", 1 },
 			},

src/Export/Skills/act_int.txt

@@ -774,7 +774,6 @@ statMap = {
 		mod("FireResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Aura" }),
 	},
 },
-#baseMod skill("auraCannotAffectSelf", true)
 #mods
 #skillEnd
 
@@ -787,7 +786,6 @@ statMap = {
 		mod("ColdResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Aura" }),
 	},
 },
-#baseMod skill("auraCannotAffectSelf", true)
 #mods
 #skillEnd
 
@@ -800,7 +798,6 @@ statMap = {
 		mod("LightningResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Aura" }),
 	},
 },
-#baseMod skill("auraCannotAffectSelf", true)
 #mods
 #skillEnd
 

src/Modules/BuildDisplayStats.lua

@@ -33,6 +33,7 @@ local displayStats = {
 	{ stat = "CritMultiplier", label = "Crit Multiplier", fmt = "d%%", pc = true, condFunc = function(v,o) return (o.CritChance or 0) > 0 end },
 	{ stat = "HitChance", label = "Hit Chance", fmt = ".0f%%", flag = "attack" },
 	{ stat = "HitChance", label = "Hit Chance", fmt = ".0f%%", condFunc = function(v,o) return o.enemyHasSpellBlock end },
+	{ stat = "AccuracyHitChanceUncapped", label = "Uncap. Hit Chance", fmt = ".0f%%", flag = "attack", condFunc = function(v,o) if o.AccuracyHitChanceUncapped then return o.AccuracyHitChanceUncapped > 100 end end },
 	{ stat = "TotalDPS", label = "Hit DPS", fmt = ".1f", compPercent = true, flag = "notAverage" },
 	{ stat = "PvpTotalDPS", label = "PvP Hit DPS", fmt = ".1f", compPercent = true, flag = "notAveragePvP" },
 	{ stat = "TotalDPS", label = "Hit DPS", fmt = ".1f", compPercent = true, flag = "showAverage", condFunc = function(v,o) return (o.TriggerTime or 0) ~= 0 end },

src/Modules/CalcDefence.lua

@@ -36,6 +36,14 @@ function calcs.hitChance(evasion, accuracy)
 	return m_max(m_min(round(rawChance), 100), 5)	
 end
 
+-- Calculate uncapped hit chance for mods that enable "Chance to hit with Attacks can exceed 100%"
+function calcs.hitChanceUncapped(evasion, accuracy)
+	if accuracy < 0 then
+		return 5
+	end
+	local rawChance = ( accuracy * 1.5 ) / ( accuracy + evasion ) * 100
+	return m_max(round(rawChance), 5)	
+end
 -- Calculate damage reduction from armour, float
 function calcs.armourReductionF(armour, raw)
 	if armour == 0 and raw == 0 then

src/Modules/CalcOffence.lua

@@ -2194,6 +2194,26 @@ function calcs.offence(env, actor, activeSkill)
 				}
 			end
 		end
+		-- Accounting for mods that enable "Chance to hit with Attacks can exceed 100%"
+		if skillModList:Flag(nil,"Condition:HitChanceCanExceed100") and output.AccuracyHitChance == 100 then
+			local enemyEvasion = m_max(round(calcLib.val(enemyDB, "Evasion")), 0)
+			output.AccuracyHitChanceUncapped = m_max(calcs.hitChanceUncapped(enemyEvasion, accuracyVsEnemy) * calcLib.mod(skillModList, cfg, "HitChance"), output.AccuracyHitChance) -- keep higher chance in case of "CannotBeEvaded"
+			if breakdown and breakdown.AccuracyHitChance then
+				t_insert(breakdown.AccuracyHitChance, "Uncapped hit chance: " .. output.AccuracyHitChanceUncapped .. "%")
+			elseif breakdown then
+				breakdown.AccuracyHitChance = {
+					"Enemy level: "..env.enemyLevel..(env.configInput.enemyLevel and " ^8(overridden from the Configuration tab" or " ^8(can be overridden in the Configuration tab)"),
+					"Enemy evasion: "..enemyEvasion,
+					"Approximate hit chance: "..output.AccuracyHitChance.."%",
+					"Uncapped hit chance: " .. output.AccuracyHitChanceUncapped .. "%"
+				}
+			end
+			local handCondition = (pass.label == "Off Hand") and "OffHandAttack" or "MainHandAttack"
+			if output.AccuracyHitChanceUncapped - 100 > 0 then
+				skillModList:NewMod("Multiplier:ExcessHitChance", "BASE", round(output.AccuracyHitChanceUncapped - 100, 2), "HitChanceCanExceed100", { type = "Condition", var = handCondition})
+			end
+
+		end
 		--enemy block chance
 		output.enemyBlockChance = m_max(m_min((enemyDB:Sum("BASE", cfg, "BlockChance") or 0), 100) - skillModList:Sum("BASE", cfg, "reduceEnemyBlock"), 0)
 		if enemyDB:Flag(nil, "CannotBlockAttacks") and isAttack then
@@ -2451,6 +2471,7 @@ function calcs.offence(env, actor, activeSkill)
 		-- Combine hit chance and attack speed
 		combineStat("AccuracyHitChance", "AVERAGE")
 		combineStat("HitChance", "AVERAGE")
+		combineStat("AccuracyHitChanceUncapped", "AVERAGE")
 		combineStat("Speed", "AVERAGE")
 		combineStat("HitSpeed", "OR")
 		combineStat("HitTime", "OR")

src/Modules/ModParser.lua

@@ -2380,6 +2380,9 @@ local specialModList = {
 	["leeche?s? ([%d%.]+)%% of (%a+) attack damage as life"] = function(num, _, dmgType) return {
 		mod(firstToUpper(dmgType) .. "DamageLifeLeech", "BASE", num, nil, ModFlag.Attack, 0),
 	} end,
+	-- Amazon
+	["chance to hit with attacks can exceed 100%%"] = {flag("Condition:HitChanceCanExceed100", { type = "Skilltype", skillType = SkillType.Attack})},
+	["gain additional critical hit chance equal to (%d+)%% of excess chance to hit with attacks"] = function(num) return { mod("CritChance", "BASE", 0.01 * num, { type = "Multiplier", var = "ExcessHitChance" }, { type = "SkillType", skillType = SkillType.Attack})} end,
 	-- Ascendant
 	["grants (%d+) passive skill points?"] = function(num) return { mod("ExtraPoints", "BASE", num) } end,
 	["can allocate passives from the %a+'s starting point"] = { },