Merge branch 'PathOfBuildingCommunity:dev' into trade-mode-selection

Author: Mizkii

RELEASE.md

@@ -27,6 +27,13 @@ Steps:
 
 Updating data from the GGPK uses the PoB exporter (see CONTRIBUTING.md#exporting-ggpk-data-from-path-of-exile).  Run each script in order, then check the differences in data to make sure nothing is missing that is expected.
 
+## Trade query and mod weight updates
+
+1. Delete `src/Data/QueryMods.lua`, then open the "Trade for these items" pane in PoB to re-generate it.
+2. In `src/Export/Scripts/ScriptResources`, there are several files that contain hardcoded mods.  If a new mod is added to the game and we can't automatically get weights for it from the ggpk, we need to check the trade site.
+3. Search the corresponding ModX.lua file for `{ "default" }` to find mods that don't have any spawn weights.
+4. Search for those mods on the trade site to find what bases (if any) the mod needs to be added to in `ScriptResources`
+
 ## Skill tree updates
 
 Skill tree updates require JSON data, usually released by GGG a few days before a new

src/Classes/GemSelectControl.lua

@@ -560,11 +560,11 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 			self.tooltip:AddSeparator(10)
 			self:AddGrantedEffectInfo(gemInstance, additional)
 			for _, statSet in ipairs(additional.statSets) do
-				self:AddStatSetInfo(gemInstance, grantedEffect, statSet)
+				self:AddStatSetInfo(gemInstance, additional, statSet)
 			end
 		else
 			for _, statSet in ipairs(additional.statSets) do
-				self:AddStatSetInfo(gemInstance, grantedEffect, statSet, true)
+				self:AddStatSetInfo(gemInstance, additional, statSet, true)
 			end
 		end
 	end
@@ -573,7 +573,7 @@ end
 function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 	local displayInstance = gemInstance.displayEffect or gemInstance
 	local grantedEffectLevel = grantedEffect.levels[displayInstance.level] or { }
-	if gemInstance.gemData.Tier and not grantedEffect.isLineage then
+	if gemInstance.gemData.Tier and not grantedEffect.isLineage and not grantedEffect.hidden then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FTier: ^7%d", gemInstance.gemData.Tier))
 		end
 	if addReq and not grantedEffect.support then
@@ -651,7 +651,7 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 			if grantedEffectLevel.baseMultiplier then
 				self.tooltip:AddLine(16, string.format("^x7F7F7FAttack Damage: ^7%g%% of base", grantedEffectLevel.baseMultiplier * 100))
 			end
-		else
+		elseif not grantedEffect.hidden then
 			if grantedEffect.castTime > 0 then
 				self.tooltip:AddLine(16, string.format("^x7F7F7FCast Time: ^7%.2f sec", grantedEffect.castTime))
 			else
@@ -661,7 +661,7 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 		if grantedEffectLevel.critChance then
 			self.tooltip:AddLine(16, string.format("^x7F7F7FCritical Hit Chance: ^7%.2f%%", grantedEffectLevel.critChance))
 		end
-		if gemInstance.gemData.weaponRequirements then
+		if gemInstance.gemData.weaponRequirements and not grantedEffect.hidden then
 			self.tooltip:AddLine(16, "^x7F7F7F Requires: ^7" .. gemInstance.gemData.weaponRequirements)
 		end
 	end

src/Classes/Item.lua

@@ -809,7 +809,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 			local specificItemType = self.base.type:lower()
 			for runeName, runeMods in pairs(data.itemMods.Runes) do
 				local addModToGroupedRunes = function (modLine)
-					local runeValue
+					local runeValue = 1
 					local runeStrippedModLine = modLine:gsub("(%d%.?%d*)", function(val)
 						runeValue = val
 						return "#"
@@ -835,7 +835,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 
 			local remainingRunes = self.itemSocketCount
 			for i, modLine in ipairs(self.runeModLines) do
-				local value
+				local value = 1
 				local strippedModLine = modLine.line:gsub("(%d%.?%d*)", function(val)
 					value = val
 					return "#"

src/Classes/SkillsTab.lua

@@ -756,41 +756,53 @@ function SkillsTabClass:CreateGemSlot(index)
 		end
 		-- Function for both granted effect and secondary such as vaal
 		local addQualityLines = function(qualityList, grantedEffect)
-			tooltip:AddLine(18, colorCodes.GEM..grantedEffect.name)
-			-- Hardcoded to use 20% quality instead of grabbing from gem, this is for consistency and so we always show something
-			tooltip:AddLine(16, colorCodes.NORMAL.."At +20% Quality:")
-			for k, qual in pairs(qualityList) do
-				-- Do the stats one at a time because we're not guaranteed to get the descriptions in the same order we look at them here
-				local stats = { }
-				stats[qual[1]] = qual[2] * 20
-				local descriptions = self.build.data.describeStats(stats, grantedEffect.statSets[1].statDescriptionScope)
-				-- line may be nil if the value results in no line due to not being enough quality
-				for _, line in ipairs(descriptions) do
-					if line then
-						-- Check if we have a handler for the mod in the gem's statMap or in the shared stat map for skills
-						if grantedEffect.statSets[1].statMap[qual[1]] or self.build.data.skillStatMap[qual[1]] then
-							tooltip:AddLine(16, colorCodes.MAGIC..line)
-						else
-							local line = colorCodes.UNSUPPORTED..line
-							line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
-							tooltip:AddLine(16, line)
+			if #qualityList > 0 then
+				if grantedEffect.name == "" then
+					tooltip:AddLine(18, colorCodes.GEM..grantedEffect.statSets[1].label)
+				else
+					tooltip:AddLine(18, colorCodes.GEM..grantedEffect.name)
+				end
+				-- Hardcoded to use 20% quality instead of grabbing from gem, this is for consistency and so we always show something
+				tooltip:AddLine(16, colorCodes.NORMAL.."At +20% Quality:")
+				for k, qual in pairs(qualityList) do
+					-- Do the stats one at a time because we're not guaranteed to get the descriptions in the same order we look at them here
+					local stats = { }
+					stats[qual[1]] = qual[2] * 20
+					local descriptions = self.build.data.describeStats(stats, grantedEffect.statSets[1].statDescriptionScope, true)
+					-- line may be nil if the value results in no line due to not being enough quality
+					for _, line in ipairs(descriptions) do
+						if line then
+							-- Check if we have a handler for the mod in the gem's statMap or in the shared stat map for skills
+							if grantedEffect.statSets[1].statMap[qual[1]] or self.build.data.skillStatMap[qual[1]] then
+								tooltip:AddLine(16, colorCodes.MAGIC..line)
+							else
+								local line = colorCodes.UNSUPPORTED..line
+								line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
+								tooltip:AddLine(16, line)
+							end
 						end
 					end
 				end
 			end
 		end
 		-- Check if there is a quality of this type for the effect
-		if gemData and gemData.grantedEffect.qualityStats then
+		-- Currently only checks the first 2 additionalGrantedEffects. Will need to fix if gems ever add more
+		if gemData and gemData.grantedEffect.qualityStats and #gemData.grantedEffect.qualityStats > 0 then
 			local qualityTable = gemData.grantedEffect.qualityStats
 			addQualityLines(qualityTable, gemData.grantedEffect)
 		end
-		if gemData and gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats then
-			local qualityTable = gemData.secondaryGrantedEffect.qualityStats
+		if gemData and gemData.additionalGrantedEffects[1] and gemData.additionalGrantedEffects[1].qualityStats and #gemData.additionalGrantedEffects[1].qualityStats > 0 then
+			local qualityTable = gemData.additionalGrantedEffects[1].qualityStats
+			tooltip:AddSeparator(10)
+			addQualityLines(qualityTable, gemData.additionalGrantedEffects[1])
+		end
+		if gemData and gemData.additionalGrantedEffects[2] and gemData.additionalGrantedEffects[2].qualityStats and #gemData.additionalGrantedEffects[2].qualityStats > 0  then
+			local qualityTable = gemData.additionalGrantedEffects[2].qualityStats
 			tooltip:AddSeparator(10)
-			addQualityLines(qualityTable, gemData.secondaryGrantedEffect)
+			addQualityLines(qualityTable, gemData.additionalGrantedEffects[2])
 		end
 		-- Add stat comparisons for hovered quality (based on set quality)
-		if gemData and (gemData.grantedEffect.qualityStats or (gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats)) and self.displayGroup.gemList[index] then
+		if gemData and (gemData.grantedEffect.qualityStats or (gemData.additionalGrantedEffects[1] and gemData.additionalGrantedEffects[1].qualityStats or gemData.additionalGrantedEffects[2] and gemData.additionalGrantedEffects[2].qualityStats)) and self.displayGroup.gemList[index] then
 			local calcFunc, calcBase = self.build.calcsTab:GetMiscCalculator(self.build)
 			if calcFunc then
 				local storedQuality = self.displayGroup.gemList[index].quality

src/Data/Bases/bow.lua

@@ -157,7 +157,7 @@ itemBases["Twin Bow"] = {
 	tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, },
 	implicit = "Bow Attacks fire an additional Arrow",
 	implicitModTypes = { { "attack" }, },
-	weapon = { PhysicalMin = 29, PhysicalMax = 53, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, },
+	weapon = { PhysicalMin = 32, PhysicalMax = 60, CritChanceBase = 5, AttackRateBase = 1.1, Range = 120, },
 	req = { level = 54, dex = 96, },
 }
 itemBases["Adherent Bow"] = {

src/Data/Bases/shield.lua

@@ -251,8 +251,9 @@ itemBases["Tawhoan Tower Shield"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 197, MovementPenalty = 0.03, },
+	armour = { BlockChance = 26, Armour = 197, MovementPenalty = 0.03, },
 	req = { level = 80, str = 115, },
 }
 itemBases["Aged Tower Shield"] = {
@@ -360,8 +361,9 @@ itemBases["Tawhoan Tower Shield"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 197, MovementPenalty = 0.03, },
+	armour = { BlockChance = 26, Armour = 197, MovementPenalty = 0.03, },
 	req = { level = 80, str = 115, },
 }
 
@@ -613,8 +615,9 @@ itemBases["Desert Buckler"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Parry",
 	implicitModTypes = { },
-	armour = { Evasion = 144, },
+	armour = { BlockChance = 20, Evasion = 144, },
 	req = { level = 80, dex = 115, },
 }
 itemBases["Oak Buckler"] = {
@@ -722,8 +725,9 @@ itemBases["Desert Buckler"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Parry",
 	implicitModTypes = { },
-	armour = { Evasion = 144, },
+	armour = { BlockChance = 20, Evasion = 144, },
 	req = { level = 80, dex = 115, },
 }
 
@@ -953,8 +957,9 @@ itemBases["Golden Targe"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 109, Evasion = 99, MovementPenalty = 0.015, },
+	armour = { BlockChance = 25, Armour = 109, Evasion = 99, MovementPenalty = 0.015, },
 	req = { level = 80, str = 63, dex = 63, },
 }
 itemBases["Ironwood Targe"] = {
@@ -1062,8 +1067,9 @@ itemBases["Golden Targe"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 109, Evasion = 99, MovementPenalty = 0.015, },
+	armour = { BlockChance = 25, Armour = 109, Evasion = 99, MovementPenalty = 0.015, },
 	req = { level = 80, str = 63, dex = 63, },
 }
 
@@ -1293,8 +1299,9 @@ itemBases["Blacksteel Crest Shield"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, },
+	armour = { BlockChance = 25, Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, },
 	req = { level = 80, str = 63, int = 63, },
 }
 itemBases["Painted Crest Shield"] = {
@@ -1402,8 +1409,9 @@ itemBases["Blacksteel Crest Shield"] = {
 	quality = 20,
 	socketLimit = 3,
 	tags = { karui_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, },
+	implicit = "Grants Skill: Level (1-20) Raise Shield",
 	implicitModTypes = { },
-	armour = { Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, },
+	armour = { BlockChance = 25, Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, },
 	req = { level = 80, str = 63, int = 63, },
 }
 

src/Data/FlavourText.lua

@@ -3112,6 +3112,14 @@ return {
 		},
 	},
 	[389] = {
+		id = "FourUniqueJewel11",
+		name = "Undying Hate",
+		text = {
+			"They believed themselves driven by necessity,",
+			"but that desperation made them monstrous.",
+		},
+	},
+	[390] = {
 		id = "FourUniqueJewel12",
 		name = "Heart of the Well",
 		text = {

src/Data/Gems.lua

@@ -10039,14 +10039,15 @@ return {
 			support = true,
 			grants_active_skill = true,
 			lineage = true,
+			spell = true,
 			area = true,
 			chaos = true,
 			curse = true,
 			hazard = true,
 		},
 		gemType = "Support",
 		gemFamily = "Cursed Ground",
-		tagString = "Lineage, AoE, Chaos, Curse, Hazard",
+		tagString = "Lineage, Spell, AoE, Chaos, Curse, Hazard",
 		reqStr = 0,
 		reqDex = 0,
 		reqInt = 100,