Merge branch 'dev' into fix/jewel-socket-res-and-displayStats-with-ATD

Author: LocalIdentity

changelog.txt

@@ -8,18 +8,18 @@ It was a lot  of work and there are sure to be an above-average number of bugs a
 changed from PoE1 to PoE2.
 At release of PoE2 Early Access a subset of the PoBCommunity team dug in and got to work carving
 data/memory/assets/their-time like nobody's business in an effort to get this port put together.
-It took us much longer than we anticipated (partially because many of us to this day highly enjoy playing PoE2 and
-coding takes a back seat on some days; partially because it was Holiday Season; and partially b/c GGG did not provide
-us with a Passive Skill Tree and the assets we normally have so we had to go dig them up).
+It took us much longer than we anticipated (partially because many of us - to this day - highly enjoy playing PoE2 
+and coding takes a back seat on some days; partially because it was Holiday Season; and partially because GGG did
+not provide us with a Passive Skill Tree and the assets we normally have, so we had to go dig them up).
 
-Huge thanks to: LocalIdentity, Nostrademous, trompetin17, PJacek, sida-wang, Peechey,
-QuickStick123, deathbeam, Helyos96, zao, Wires77
+Huge thanks to: LocalIdentity, Nostrademous, trompetin17, TPlant, sida-wang, Peechey,
+                QuickStick123, deathbeam, Helyos96, zao, Wires77
 
 In this version we are releasing the following initial features:
-* PoE2 Passive Skill Tree and "most" Ascendancy support (including Weapon Set Skill Points)
+* PoE2 Passive Skill Tree and support for "most" Ascendancies (including Weapon Set Skill Points)
 * Support for Attribute Switching on small passive tree nodes
 * Basic support for most Skills and Supports gems with Stat Sets breakdowns for skills with multiple parts or effects
-* Support for many (possibly all) known unique items (outside of skills granted by items as previously mentioned)
+* Support for many (possibly all) known unique items
 * Re-coded ailment calculations formula
 * Much improved skill tree rendering engine
 * Rune & Soul Core support
@@ -28,21 +28,20 @@ In this version we are releasing the following initial features:
 
 
 
-A quick hit-list of things that ARE NOT SUPPORTED in this initial release:
+A quick hit-list of things that ^1ARE NOT SUPPORTED ^7in this initial release:
 
-* Character Importing (GGG has not yet enabled the API that will allow us to import characters)
+* Character Importing - GGG has not yet enabled the API that will allow us to import characters
 * Meta Skills / Trigger Skills damage calculation - this needs an entire overhaul we didn't have time to do thus far
 * Skill Combos - it is our hope in the future to implement the concepts of "rotations" in a given skill
-(e.g., Tempest Flurry: normal strike -> normal strike -> third strike -> final strike
--- that is the rotation of holding down the skill button in game, each one has slightly different speed, modifiers,
-and damage potential; we plan to enable calculation of the DPS of a "rotation" in the future)
+        i.e. the rotation of holding down the skill button in game, each one has slightly different speed, modifiers,
+        and damage potential
+        (e.g., Tempest Flurry: normal strike -> normal strike -> third strike -> final strike)     
 * Weapon Set Swap combos
-* Full support for Item Crafting (a lot is there, but weights are hidden by GGG now so knowing probability
-of certain events happening needs to be crowd-sourced)
-* Support for all Nodes / Modifiers / Ascendancies (many are supported, but not all - follow the logic of"if a modifier
-on an item, tree node or ascendancy node is 'blue colored' we parse it and hopefully support it, if it's 'red colored'
-we do not."
-* Proper support for Skills granted by Items (we still need to complete the process of fully removing the concept of
-skill gems being tied to item sockets that was in PoE1 to allow for this, we just ran out of time)
+* Support for all Nodes / Modifiers / Ascendancies
+        Many are supported, but not all - if a modifier on an item, tree node or ascendancy node is 'blue coloured' 
+        we parse it - and hopefully support it - if it's 'red coloured' we do not.
+* Proper support for Skills granted by Items
+        We still need to complete the process of fully removing the concept of
+        skill gems being tied to item sockets that was in PoE1 to allow for this, we just ran out of time
 * Map Mods
 * Boss Skills

manifest.xml

@@ -1298,7 +1298,7 @@ function SkillsTabClass:UpdateGlobalGemCountAssignments()
 	for _, socketGroup in ipairs(self.socketGroupList) do
 		local countGroup = true
 		for _, gemInstance in ipairs(socketGroup.gemList) do
-			if gemInstance.fromItem then
+			if gemInstance.fromItem or (gemInstance.gemData and gemInstance.gemData.grantedEffect and gemInstance.gemData.grantedEffect.fromTree) then
 				countGroup = false
 			end
 			if gemInstance.gemData then

src/Classes/SkillsTab.lua

@@ -559,7 +559,7 @@ skills["SupportDeadlyPoisonPlayer"] = {
 			statDescriptionScope = "gem_stat_descriptions",
 			statMap = {
 				["support_deadly_poison_hit_damage_+%_final"] = {
-					mod("Damage", "MORE", nil, ModFlag.Hit, KeywordFlag.Poison),
+					mod("Damage", "MORE", nil, ModFlag.Hit),
 				},
 				["support_deadly_poison_poison_effect_+%_final"] = {
 					mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Poison),
@@ -1936,4 +1936,4 @@ skills["SupportWindowOfOpportunityPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_dex.lua

@@ -450,7 +450,7 @@ skills["SupportDeepCutsPlayer"] = {
 					mod("Damage", "MORE", nil, ModFlag.Hit),
 				},
 				["support_deep_cuts_bleeding_effect_+%_final"] = {
-					mod("BleedMagnitude", "MORE", nil),
+					mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Bleed),
 				},
 			},
 			baseFlags = {
@@ -2090,4 +2090,4 @@ skills["SupportVitalityPlayer"] = {
 			},
 		},
 	}
-}
+}

src/Data/Skills/sup_str.lua

@@ -149,7 +149,7 @@ statMap = {
 #set SupportDeadlyPoisonPlayer
 statMap = {
 	["support_deadly_poison_hit_damage_+%_final"] = {
-		mod("Damage", "MORE", nil, ModFlag.Hit, KeywordFlag.Poison),
+		mod("Damage", "MORE", nil, ModFlag.Hit),
 	},
 	["support_deadly_poison_poison_effect_+%_final"] = {
 		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Poison),
@@ -492,4 +492,4 @@ statMap = {
 	},
 },
 #mods
-#skillEnd
+#skillEnd

src/Export/Skills/sup_dex.txt

@@ -127,7 +127,7 @@ statMap = {
 		mod("Damage", "MORE", nil, ModFlag.Hit),
 	},
 	["support_deep_cuts_bleeding_effect_+%_final"] = {
-		mod("BleedMagnitude", "MORE", nil),
+		mod("AilmentMagnitude", "MORE", nil, 0, KeywordFlag.Bleed),
 	},
 },
 #mods
@@ -582,4 +582,4 @@ statMap = {
 	},
 },
 #mods
-#skillEnd
+#skillEnd

src/Export/Skills/sup_str.txt

@@ -8,6 +8,10 @@ buildSites = { }
 
 -- Import/Export websites list used in dropdowns
 buildSites.websiteList = {
+	{
+		label = "Maxroll", id = "Maxroll", matchURL = "maxroll%.gg/poe2/pob/.*", regexURL = "maxroll%.gg/poe2/pob/(.+)%s*$", downloadURL = "maxroll%.gg/poe2/api/pob/%1",
+		codeOut = "https://maxroll.gg/poe2/pob/", postUrl = "https://maxroll.gg/poe2/api/pob", postFields = "pobCode=", linkURL = "maxroll%.gg/poe2/pob/%1"
+	},
 	{
 		label = "pobb.in", id = "POBBin", matchURL = "pobb%.in/.+", regexURL = "pobb%.in/(.+)%s*$", downloadURL = "pobb.in/pob/%1",
 		codeOut = "https://pobb.in/", postUrl = "https://pobb.in/pob/", postFields = "", linkURL = "pobb.in/%1"
@@ -71,8 +75,8 @@ function buildSites.DownloadBuild(link, websiteInfo, callback)
 	-- Only called on program start via protocol handler
 	if not websiteInfo then
 		for _, siteInfo in ipairs(buildSites.websiteList) do
-			if link:match("^pob:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)") then
-				siteCodeURL = link:gsub("^pob:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)", "https://" .. siteInfo.downloadURL)
+			if link:match("^pob2:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)") then
+				siteCodeURL = link:gsub("^pob2:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)", "https://" .. siteInfo.downloadURL)
 				websiteInfo = siteInfo
 				break
 			end
@@ -94,14 +98,14 @@ function buildSites.DownloadBuild(link, websiteInfo, callback)
 end
 
 -- Parses and converts URI's to import links. Currently only supports protocol handler URI's, extend as needed.
--- @param uri String Example: pob://pobbin/<id> or pob://poeninja/<id>
+-- @param uri String Example: pob2://pobbin/<id> or pob2://poeninja/<id>
 function buildSites.ParseImportLinkFromURI(uri)
 	local importLink = nil
 
 	-- Check if it's an URI from protocol handler
 	for _, siteInfo in ipairs(buildSites.websiteList) do
-		if uri:match("^pob:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)") then
-			importLink = uri:gsub("^pob:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)", "https://" .. siteInfo.linkURL)
+		if uri:match("^pob2:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)") then
+			importLink = uri:gsub("^pob2:[/\\]*" .. siteInfo.id:lower() .. "[/\\]+(.+)", "https://" .. siteInfo.linkURL)
 			break
 		end
 	end

src/Modules/BuildSiteTools.lua

@@ -3908,19 +3908,21 @@ function calcs.offence(env, actor, activeSkill)
 		-- Calculates damage to be used in damaging ailment calculations
 		local function calcAilmentSourceDamage(ailment, defaultDamageTypes)
 			local canCrit = not skillModList:Flag(cfg, "AilmentsAreNeverFromCrit")
-			local hitMin, hitMax = 0, 0, 0
-			local critMin, critMax = 0, 0, 0
+			local hitMin, hitMax = 0, 0
+			local critMin, critMax = 0, 0
 			for _, damageType in ipairs(dmgTypeList) do
 				if canDoAilment(ailment, damageType, defaultDamageTypes) then
 					local override = skillModList:Override(cfg, ailment .. damageType .. "HitDamage")
-					hitMin = hitMin + (override or output[damageType.."StoredHitMin"])
-					hitMax = hitMax + (override or output[damageType.."StoredHitMax"])
-					output[ailment .. damageType .. "Min"] = (override or output[damageType.."StoredHitMin"])
-					output[ailment .. damageType .. "Max"] = (override or output[damageType.."StoredHitMin"])
+					local ailmentHitMin = override or output[damageType.."StoredHitMin"] or 0
+					local ailmentHitMax = override or output[damageType.."StoredHitMax"] or 0
+					hitMin = hitMin + ailmentHitMin
+					hitMax = hitMax + ailmentHitMax
+					output[ailment .. damageType .. "Min"] = ailmentHitMin
+					output[ailment .. damageType .. "Max"] = ailmentHitMax
 					if canCrit then
-						local override = skillModList:Override(cfg, ailment .. damageType .. "CritDamage")
-						critMin = critMin + (override or output[damageType.."StoredCritMin"])
-						critMax = critMax + (override or output[damageType.."StoredCritMax"])
+						override = skillModList:Override(cfg, ailment .. damageType .. "CritDamage")
+						critMin = critMin + (override or output[damageType.."StoredCritMin"] or 0)
+						critMax = critMax + (override or output[damageType.."StoredCritMax"] or 0)
 					end
 				end
 			end