Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [v2.35.4](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.4) (2023/12/07)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.3...v2.35.4)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+### New to Path of Building
+- Add socket limit warning [\#6937](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6937) ([sida-wang](https://github.com/sida-wang))
+
+### Fixed Bugs
+- Fix Vortex base damage over time values [\#6945](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6945) ([LocalIdentity](https://github.com/LocalIdentity))
+
+### Accuracy Improvements
+- Fix socketed gem count calculation [\#6937](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6937) ([sida-wang](https://github.com/sida-wang))
+- Fix Evasion ES Mastery mod for ES on rings [\#6944](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6944) ([Lilylicious](https://github.com/Lilylicious))
+- Update Reap + Vaal Reap quality mods [\#6942](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6942) ([henbe](https://github.com/henbe))
+
+
 ## [v2.35.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.3) (2023/12/06)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.2...v2.35.3)
@@ -14,8 +33,6 @@
 - Update Splitting Steel quality mod [\#6927](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6927) ([kayokalinauskas](https://github.com/kayokalinauskas))
 
 
-
-
 ## [v2.35.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.2) (2023/12/06)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.1...v2.35.2)
@@ -32,7 +49,6 @@
 - Remove dead Divine Ire mods [\#6922](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6922) ([LocalIdentity](https://github.com/LocalIdentity))
 
 
-
 ## [v2.35.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.1) (2023/12/06)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.0...v2.35.1)

changelog.txt

@@ -1,3 +1,16 @@
+VERSION[2.35.4][2023/12/07]
+
+--- New to Path of Building ---
+* Add socket limit warning (sida-wang)
+
+--- Fixed Bugs ---
+* Fix Vortex base damage over time values (LocalIdentity)
+
+--- Accuracy Improvements ---
+* Fix socketed gem count calculation (sida-wang)
+* Fix Evasion ES Mastery mod for ES on rings (Lilylicious)
+* Update Reap + Vaal Reap quality mods (henbe)
+
 VERSION[2.35.3][2023/12/06]
 
 --- Fixed Bugs ---

manifest.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.35.3" />
+	<Version number="2.35.4" />
 	<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />

src/Data/Skills/act_str.lua

@@ -7655,7 +7655,7 @@ skills["Bloodreap"] = {
 	},
 	qualityStats = {
 		Default = {
-			{ "base_skill_area_of_effect_+%", 0.5 },
+			{ "blood_scythe_damage_+%_final_per_charge", 0.25 },
 		},
 		Alternate1 = {
 			{ "critical_strike_chance_+%", 3 },
@@ -7730,6 +7730,9 @@ skills["VaalReap"] = {
 	statDescriptionScope = "debuff_skill_stat_descriptions",
 	castTime = 0.8,
 	statMap = {
+		["blood_scythe_damage_+%_final_per_charge"] = {
+			mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "BloodCharge" }),
+		},
 		["vaal_reap_additional_maximum_blood_charges"] = {
 			mod("BloodChargesMax", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }),
 		},
@@ -7750,7 +7753,7 @@ skills["VaalReap"] = {
 	},
 	qualityStats = {
 		Default = {
-			{ "base_skill_area_of_effect_+%", 0.5 },
+			{ "blood_scythe_damage_+%_final_per_charge", 0.25 },
 		},
 	},
 	constantStats = {
@@ -9161,4 +9164,4 @@ skills["BloodstainedBanner"] = {
 		[39] = { 27, 14, storedUses = 1, manaReservationPercent = 10, cooldown = 1, levelRequirement = 99, statInterpolation = { 1, 1, }, },
 		[40] = { 28, 14, storedUses = 1, manaReservationPercent = 10, cooldown = 1, levelRequirement = 100, statInterpolation = { 1, 1, }, },
 	},
-}
+}

src/Export/Skills/act_str.txt

@@ -1431,6 +1431,9 @@ end,
 #skill VaalReap
 #flags spell area duration
 	statMap = {
+		["blood_scythe_damage_+%_final_per_charge"] = {
+			mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "BloodCharge" }),
+		},
 		["vaal_reap_additional_maximum_blood_charges"] = {
 			mod("BloodChargesMax", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }),
 		},

src/Export/spec.lua

@@ -9496,6 +9496,13 @@ return {
 			refTo="ItemExperienceTypes",
 			type="Key",
 			width=150
+		},
+		[25]={
+			list=true,
+			name="MtxSlotTypes",
+			refTo="MicrotransactionSkillGemEffectSlotTypes",
+			type="Key",
+			width=150
 		}
 	},
 	skillmines={

src/Modules/Build.lua

@@ -1460,6 +1460,11 @@ function buildMode:InsertItemWarnings()
 			InsertIfNew(self.controls.warnings.lines, "You are exceeding jewel limit with the jewel "..warning)
 		end
 	end
+	if self.calcsTab.mainEnv.itemWarnings.socketLimitWarning then
+		for _, warning in ipairs(self.calcsTab.mainEnv.itemWarnings.socketLimitWarning) do
+			InsertIfNew(self.controls.warnings.lines, "You have too many gems in your "..warning.." slot")
+		end
+	end
 end
 
 -- Build list of side bar stats

src/Modules/CalcSetup.lua

@@ -994,7 +994,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 					local socketedGems = 0
 					-- Loop through socket groups to calculate number of socketed gems
 					for _, socketGroup in pairs(env.build.skillsTab.socketGroupList) do
-						if (socketGroup.enabled and socketGroup.slot and socketGroup.slot == slotName and socketGroup.gemList) then
+						if (not socketGroup.source and socketGroup.enabled and socketGroup.slot and socketGroup.slot == slotName and socketGroup.gemList) then
 							for _, gem in pairs(socketGroup.gemList) do
 								if (gem.gemData and gem.enabled) then
 									socketedGems = socketedGems + 1
@@ -1017,6 +1017,11 @@ function calcs.initEnv(build, mode, override, specEnv)
 					env.itemModDB.multipliers.EmptyGreenSocketsInAnySlot = (env.itemModDB.multipliers.EmptyGreenSocketsInAnySlot or 0) + slotEmptySocketsCount.G
 					env.itemModDB.multipliers.EmptyBlueSocketsInAnySlot = (env.itemModDB.multipliers.EmptyBlueSocketsInAnySlot or 0) + slotEmptySocketsCount.B
 					env.itemModDB.multipliers.EmptyWhiteSocketsInAnySlot = (env.itemModDB.multipliers.EmptyWhiteSocketsInAnySlot or 0) + slotEmptySocketsCount.W
+					-- Warn if socketed gems over socket limit
+					if socketedGems > slotGemSocketsCount then
+						env.itemWarnings.socketLimitWarning = env.itemWarnings.socketLimitWarning or { }
+						t_insert(env.itemWarnings.socketLimitWarning, slotName)
+					end
 				end
 			end
 		end

src/Modules/ModParser.lua

@@ -1423,7 +1423,7 @@ local modTagList = {
 	["while you are unencumbered"] = { tag = { type = "Condition", var = "Unencumbered" } },
 	["equipped bow"] = { tag = { type = "Condition", var = "UsingBow" } },
 	["if equipped ([%a%s]+) has an ([%a%s]+) modifier"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName } } end,
-	["if both equipped ([%a%s]+) have ([%a%s]+) modifiers"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName:sub(1, #itemSlotName - 1), bothSlots = true } } end,
+	["if both equipped ([%a%s]+) have a?n? ?([%a%s]+) modifiers?"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName:sub(1, #itemSlotName - 1), bothSlots = true } } end,
 	["if there are no ([%a%s]+) modifiers on equipped ([%a%s]+)"] = function (_, conditionSubstring, itemSlotName) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName, neg = true } } end,
 	["if there are no (%a+) modifiers on other equipped items"] = function(_, conditionSubstring) return {tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = "{SlotName}", allSlots = true, excludeSelf = true, neg = true }} end,
 	["if corrupted"] = {tag = { type = "ItemCondition", itemSlot = "{SlotName}", corruptedCond = true}},