Merge branch 'dev'

Author: LocalIdentity

CHANGELOG.md

@@ -1,3 +1,49 @@
+### 1.4.170.26 - 2021/02/07
+* Add control to set Vaal Timeless Jewel influenced passive skills to random mods (Wires77)
+* Add all new uniques in game patch 3.13.0 (Nostrademous, ppoelzl)
+* Add support for the following uniques:
+  * Arn's Anguish
+  * Doppelgänger
+  * Graven's Secret
+  * Olesya's Delight
+* Add Flickershade Spectre (Kayella)
+* Add support for "Cobra Lash Chains additional times" helmet enchantment (Puddlestomper)
+* Add Belt Enchantments to Item Crafting from Harvest improved Offering to the Goddess Uber Lab runs. Not all modifiers parse yet, but most do (Nostrademous)
+* Add Elevated Affixes to Item Crafting (Nostrademous)
+* Add support for Blizzard Crown implicit (Nostrademous)
+* Add support for Brutal, Affliction and Absorption Charge (damage recoup from Absorption Charges is not supported) coverstion from Endurance, Frenzy, Power charges via Unique Belts (Nostrademous)
+* Add support for 'On Scorched Ground' in Config Tab when using Legacy of Fury unique boots (Nostrademous)
+* Add support and extraction of 'Thirst for Blood' unique ability from Jack, the Axe unique (Nostrademous, LocalIdentity)
+* Add support for Doppleganger's insane/sane specification via Config Tab (Nostrademous)
+* Add support for Goblinedge Power/Frenzy charge interaction (ppoelzl)
+* Add limit cap to Replica Nebulis unique (Wires77)
+* Add parsing support for Anomalous Minion Life (ALT-F-X)
+* Updated Max Awakening Level for Sirus to scale to 9 achievable through Atlas Passives (Quote_a)
+* Add support for Phantasmal Ancestral Protector (ALT-F-X)
+* Add support for impale from spells (Wires77)
+* Add support for Phantasmal Might from The Black Cane (Wires77)
+* Add support for Shield Shatter on Shattershard (Wires77)
+* Add support for automatic chill from Summon Skitterbots (Quote_a)
+  
+* Fix Timeless Jewel passives not accounting for past skill tree versions (Wires77)
+* Fix Spectre stats scaling with Spectre level using incorrect values (zao)
+* Fix mod ranges on Legacy of Fury (Nostrademous)
+* Fix Endurance/Frenzy/Power charges missing for Minions (Wires77)
+* Fix multiple crashes in the skills tab related to gem quality (Nostrademous, ALT-F-X)
+* Corrected enforcement of Minion Skill level requirements (zao)
+* Fix Enduring Cry's Life Regen calculation (tommysays)
+* Fix Ancestral Cry's Armor increase calculation (tommysays)
+* Fix Divergent Minion Damage to be an "Increase" instead of "More" as it should have been (Wires77)
+* Fix accounting for Abyssal Jewels in Offhand Slots (zao)
+* Updated Replica Alberon's Warpath chaos damage gain per strength to new value (RUSshy)
+* Fix Flame Wall's secondary not being affected by Area Damage (Wires77)
+* Fix Impale Support and Divergent Fortify application of Physical Damage Reduction (Wires77)
+* Fix '+1 to Maximum Summon Ballista Totems' to not also increase the allowed count of Ancestral Totems (Wires77)
+* Fix Disintegrator to include Block Attack Damage on Ritual variant (Wires77)
+* Fix Offering to the Serpent unique gloves stat attributes (PJacek)
+* Fix Cameria's Avarice unique mace to state "on Hit" rather than "on Kill" (ALT-F-X)
+* Fix Phantasmal Smite quality bonus (ALT-F-X)
+* Updated many Configuration Tab tooltips to display updated values (zao)
 ### 1.4.170.25 - 2021/01/16
 * Fix Trinity Support
 * Fix Hrimnor's Resolve
@@ -2970,4 +3016,4 @@ Other changes:
  * Fixed an error relating to multipart skills
 
 ### 1.0.1 - 2016/08/31
- * Fixed an error in the build list screen
+ * Fixed an error in the build list screen

Classes/ConfigTab.lua

@@ -166,8 +166,8 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
 				end
 			elseif varData.ifFlag then
 				control.shown = function()
-					local skillModList = self.build.calcsTab.calcsEnv.player.mainSkill.skillModList
-					local skillFlags = self.build.calcsTab.calcsEnv.player.mainSkill.skillFlags
+					local skillModList = self.build.calcsTab.mainEnv.player.mainSkill.skillModList
+					local skillFlags = self.build.calcsTab.mainEnv.player.mainSkill.skillFlags
 					-- Check both the skill mods for flags and flags that are set via calcPerform
 					return skillFlags[varData.ifFlag] or skillModList:Flag(nil, varData.ifFlag)
 				end

Classes/GemSelectControl.lua

@@ -351,6 +351,10 @@ function GemSelectClass:Draw(viewPort)
 				gemInstance.gemData = gemData
 				-- Clear the displayEffect so it only displays the temporary gem instance
 				gemInstance.displayEffect = nil
+				-- Check valid qualityId, set to 'Default' if missing
+				if gemInstance.qualityId == nil or gemInstance.qualityId == "" then
+					gemInstance.qualityId = "Default"
+				end
 				-- Add hovered gem to tooltip
 				self:AddGemTooltip(gemInstance)
 				-- Calculate with the new gem
@@ -388,6 +392,10 @@ function GemSelectClass:Draw(viewPort)
 		if mOver and (not self.skillsTab.selControl or self.skillsTab.selControl._className ~= "GemSelectControl" or not self.skillsTab.selControl.dropped) then
 			local gemInstance = self.skillsTab.displayGroup.gemList[self.index]
 			if gemInstance and gemInstance.gemData then
+				-- Check valid qualityId, set to 'Default' if missing
+				if gemInstance.qualityId == nil or gemInstance.qualityId == "" then
+					gemInstance.qualityId = "Default"
+				end
 				SetDrawLayer(nil, 10)
 				self.tooltip:Clear()
 				self:AddGemTooltip(gemInstance)

Classes/Item.lua

@@ -21,7 +21,6 @@ local catalystTags = {
 	{ "jewellery_defense", "defences" },
 	{ "jewellery_elemental" ,"elemental_damage" },
 }
-local classNames = { ["Marauder"] = true, ["Duelist"] = true, ["Ranger"] = true, ["Shadow"] = true, ["Witch"] = true, ["Templar"] = true, ["Scion"] = true }
 
 local function getCatalystScalar(catalystId, tags, quality)
 	if not catalystId or type(catalystId) ~= "number" or not catalystTags[catalystId] or not tags or type(tags) ~= "table" or #tags == 0 then
@@ -293,7 +292,8 @@ function ItemClass:ParseRaw(raw)
 					end
 				elseif specName == "CatalystQuality" then
 					self.catalystQuality = tonumber(specVal)
-				elseif classNames[specName] then
+				-- Anything else is an explicit with a colon in it (Fortress Covenant, Pure Talent, etc) unless it's part of the custom name
+				elseif not (self.name:match(specName) and self.name:match(specVal)) then
 					foundExplicit = true
 					gameModeStage = "EXPLICIT"
 				end
@@ -567,9 +567,13 @@ function ItemClass:GetModSpawnWeight(mod, extraTags)
 			return false
 		end
 
+		local function HasMavenInfluence(modAffix)
+			return modAffix:match("Elevated")
+		end
+
 		for i, key in ipairs(mod.weightKey) do
 			if self.base.tags[key] or (extraTags and extraTags[key]) or HasInfluenceTag(key) then
-				weight = mod.weightVal[i]
+				weight = (HasInfluenceTag(key) and HasMavenInfluence(mod.affix)) and 1000 or mod.weightVal[i]
 				break
 			end
 		end
@@ -929,8 +933,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 		for _, mod in ipairs(modList) do
 			-- Convert accuracy, L/MGoH and PAD Leech modifiers to local
 			if (
-				(mod.name == "Accuracy" and mod.flags == 0) or
-                (mod.name == "ImpaleChance" ) or
+				(mod.name == "Accuracy" and mod.flags == 0) or (mod.name == "ImpaleChance" and mod.flags ~= ModFlag.Spell) or
 				((mod.name == "LifeOnHit" or mod.name == "ManaOnHit") and mod.flags == ModFlag.Attack) or
 				((mod.name == "PhysicalDamageLifeLeech" or mod.name == "PhysicalDamageManaLeech") and mod.flags == ModFlag.Attack)
 			   ) and (mod.keywordFlags == 0 or mod.keywordFlags == KeywordFlag.Attack) and not mod[1] then

Classes/ItemSlotControl.lua

@@ -27,7 +27,7 @@ local ItemSlotClass = newClass("ItemSlotControl", "DropDownControl", function(se
 	self.items = { }
 	self.selItemId = 0
 	self.slotName = slotName
-	self.slotNum = tonumber(slotName:match("%d+"))
+	self.slotNum = tonumber(slotName:match("%d+$") or slotName:match("%d+"))
 	if slotName:match("Flask") then
 		self.controls.activate = new("CheckBoxControl", {"RIGHT",self,"LEFT"}, -2, 0, 20, nil, function(state)
 			self.active = state

Classes/ItemsTab.lua

@@ -1719,7 +1719,13 @@ function ItemsTabClass:EnchantDisplayItem(enchantSlot)
 
 	local controls = { } 
 	local enchantments = self.displayItem.enchantments
-	local haveSkills = not self.displayItem.enchantments[self.build.data.labyrinths[1].name]
+	local haveSkills = true
+	for _, lab in ipairs(self.build.data.labyrinths) do
+		if self.displayItem.enchantments[lab.name] then
+			haveSkills = false
+			break
+		end
+	end
 	local skillList = { }
 	local skillsUsed = { }
 	if haveSkills then

Classes/PassiveTreeView.lua

@@ -812,7 +812,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 		tooltip:AddLine(14, colorCodes.TIP.."Tip: Hold Shift or Ctrl to hide this tooltip.")
 		return
 	end
-	
+
 	-- Node name
 	self:AddNodeName(tooltip, node, build)
 	if launch.devModeAlt then
@@ -852,6 +852,14 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build)
 		end
 	end
 
+	-- Conqueror node editing
+	if node and node.conqueredBy and
+			(node.conqueredBy.conqueror.type == "vaal"
+			or node.isNotable) then
+		tooltip:AddSeparator(14)
+		tooltip:AddLine(14, colorCodes.TIP.."Tip: Right click to edit the modifiers for this node")
+	end
+
 	-- Mod differences
 	if self.showStatDifferences then
 		local calcFunc, calcBase = build.calcsTab:GetMiscCalculator(build)

Classes/SkillsTab.lua

@@ -172,6 +172,9 @@ function SkillsTabClass:GetBaseNameAndQuality(gemTypeLine, quality)
 			for _, entry in ipairs(alternateGemQualityList) do
 				if firstword == entry.label then
 					-- return the gem name minus <altqual> without a leading space and the new resolved type
+					if entry.type == nil or entry.type == "" then
+						entry.type = "Default"
+					end
 					return otherwords, entry.type
 				end
 			end

Classes/TreeTab.lua

@@ -426,12 +426,12 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 	local controls = { }
 	local modGroups = { }
 	local smallAdditions = {"Strength", "Dex", "Devotion"}
-	if not self.build.latestTree.legion.editedNodes then
-		self.build.latestTree.legion.editedNodes = { }
+	if not self.build.spec.tree.legion.editedNodes then
+		self.build.spec.tree.legion.editedNodes = { }
 	end
 	local function buildMods(selectedNode)
 		wipeTable(modGroups)
-		for _, node in pairs(self.build.latestTree.legion.nodes) do
+		for _, node in pairs(self.build.spec.tree.legion.nodes) do
 			if node.id:match("^"..selectedNode.conqueredBy.conqueror.type.."_.+") and node["not"] == (selectedNode.isNotable or false) and not node.ks then
 				t_insert(modGroups, {
 					label = node.dn,
@@ -441,7 +441,7 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 				})
 			end
 		end
-		for _, addition in pairs(self.build.latestTree.legion.additions) do
+		for _, addition in pairs(self.build.spec.tree.legion.additions) do
 			-- exclude passives that are already added (vaal, attributes, devotion)
 			if addition.id:match("^"..selectedNode.conqueredBy.conqueror.type.."_.+") and not isValueInArray(smallAdditions, addition.dn) and selectedNode.conqueredBy.conqueror.type ~= "vaal" then
 				t_insert(modGroups, {
@@ -454,11 +454,11 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 		end
 	end
 	local function addModifier(selectedNode)
-		local newLegionNode = self.build.latestTree.legion.nodes[modGroups[controls.modSelect.selIndex].id]
+		local newLegionNode = self.build.spec.tree.legion.nodes[modGroups[controls.modSelect.selIndex].id]
 		-- most nodes only replace or add 1 mod, so we need to just get the first control
 		local modDesc = string.gsub(controls[1].label, "%^7", "")
 		if  selectedNode.conqueredBy.conqueror.type == "eternal" or selectedNode.conqueredBy.conqueror.type == "templar" then
-			self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, true)
+			self.build.spec:NodeAdditionOrReplacementFromString(selectedNode, modDesc, true)
 			selectedNode.dn = newLegionNode.dn
 			selectedNode.sprites = newLegionNode.sprites
 			selectedNode.icon = newLegionNode.icon
@@ -468,24 +468,30 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 			selectedNode.sprites = newLegionNode.sprites
 			selectedNode.icon = newLegionNode.icon
 			selectedNode.spriteId = newLegionNode.id
-			self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, true)
+			if modDesc ~= "" then
+				self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, true)
+			end
 
 			-- Vaal is the exception
-			if controls[2] then
-				modDesc = string.gsub(controls[2].label, "%^7", "")
-				self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, false)
+			local i = 2
+			while controls[i] do
+				modDesc = string.gsub(controls[i].label, "%^7", "")
+				if modDesc ~= "" then
+					self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, false)
+				end
+				i = i + 1
 			end
 		else
 			-- Replace the node first before adding the new line so we don't get multiple lines
-			if self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id] and self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id][selectedNode.id] then
-				self.specList[1]:ReplaceNode(selectedNode, self.build.latestTree.nodes[selectedNode.id])
+			if self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id] and self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id][selectedNode.id] then
+				self.build.spec:ReplaceNode(selectedNode, self.build.spec.tree.nodes[selectedNode.id])
 			end
-			self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode, modDesc, false)
+			self.build.spec:NodeAdditionOrReplacementFromString(selectedNode, modDesc, false)
 		end
-		if not self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id] then
-			t_insert(self.build.latestTree.legion.editedNodes, selectedNode.conqueredBy.id, {})
+		if not self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id] then
+			t_insert(self.build.spec.tree.legion.editedNodes, selectedNode.conqueredBy.id, {})
 		end
-		t_insert(self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id], selectedNode.id, copyTable(selectedNode, true))
+		t_insert(self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id], selectedNode.id, copyTable(selectedNode, true))
 	end
 
 	local function constructUI(modGroup)
@@ -496,18 +502,29 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 			controls["slider"..i] = nil
 			i = i + 1
 		end
-		for idx, desc in ipairs(modGroup.descriptions) do
-			controls[idx] = new("LabelControl", {"TOPLEFT", controls["slider"..idx-1] or controls[idx-1] or controls.modSelect,"TOPLEFT"}, 0, 20, 600, 16, "^7"..desc)
-			totalHeight = totalHeight + 20
-			if desc:match("%(%-?[%d%.]+%-[%d%.]+%)") then
-				controls["slider"..idx] = new("SliderControl", {"TOPLEFT",controls[idx],"BOTTOMLEFT"}, 0, 2, 300, 16, function(val)
-					controls[idx].label = itemLib.applyRange(modGroup.descriptions[idx], val)
+		-- special handling for custom vaal notables (Might of the Vaal and Legacy of the Vaal)
+		if next(modGroup.descriptions) == nil then
+			for idx=1,4 do
+				controls[idx] = new("EditControl", {"TOPLEFT", controls["slider"..idx-1] or controls[idx-1] or controls.modSelect,"TOPLEFT"}, 0, 20, 600, 16, "", "Modifier "..idx, "%c%(%)", 100, function(buf)
+					controls[idx].label = buf
 				end)
-				controls["slider"..idx]:SetVal(.5)
-				controls["slider"..idx].width = function()
-					return controls["slider"..idx].divCount and 300 or 100
-				end
+				controls[idx].label = ""
+				totalHeight = totalHeight + 20
+			end
+		else
+			for idx, desc in ipairs(modGroup.descriptions) do
+				controls[idx] = new("LabelControl", {"TOPLEFT", controls["slider"..idx-1] or controls[idx-1] or controls.modSelect,"TOPLEFT"}, 0, 20, 600, 16, "^7"..desc)
 				totalHeight = totalHeight + 20
+				if desc:match("%(%-?[%d%.]+%-[%d%.]+%)") then
+					controls["slider"..idx] = new("SliderControl", {"TOPLEFT",controls[idx],"BOTTOMLEFT"}, 0, 2, 300, 16, function(val)
+						controls[idx].label = itemLib.applyRange(modGroup.descriptions[idx], val)
+					end)
+					controls["slider"..idx]:SetVal(.5)
+					controls["slider"..idx].width = function()
+						return controls["slider"..idx].divCount and 300 or 100
+					end
+					totalHeight = totalHeight + 20
+				end
 			end
 		end
 		main.popups[1].height = totalHeight + 30
@@ -534,29 +551,29 @@ function TreeTabClass:ModifyNodePopup(selectedNode)
 		main:ClosePopup()
 	end)
 	controls.reset = new("ButtonControl", nil, 0, 75, 80, 20, "Reset Node", function()
-		if self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id] then
-			self.build.latestTree.legion.editedNodes[selectedNode.conqueredBy.id][selectedNode.id] = nil
+		if self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id] then
+			self.build.spec.tree.legion.editedNodes[selectedNode.conqueredBy.id][selectedNode.id] = nil
 		end
 		if selectedNode.conqueredBy.conqueror.type == "vaal" and selectedNode.type == "Normal" then
-			local legionNode = self.build.latestTree.legion.nodes["vaal_small_fire_resistance"]
+			local legionNode = self.build.spec.tree.legion.nodes["vaal_small_fire_resistance"]
 			selectedNode.dn = "Vaal small node"
 			selectedNode.sd = {"Right click to set mod"}
 			selectedNode.sprites = legionNode.sprites
 			selectedNode.mods = {""}
 			selectedNode.modList = new("ModList")
 			selectedNode.modKey = ""
 		elseif selectedNode.conqueredBy.conqueror.type == "vaal" and selectedNode.type == "Notable" then
-			local legionNode = self.build.latestTree.legion.nodes["vaal_notable_curse_1"]
+			local legionNode = self.build.spec.tree.legion.nodes["vaal_notable_curse_1"]
 			selectedNode.dn = "Vaal notable node"
 			selectedNode.sd = {"Right click to set mod"}
 			selectedNode.sprites = legionNode.sprites
 			selectedNode.mods = {""}
 			selectedNode.modList = new("ModList")
 			selectedNode.modKey = ""
 		else
-			self.specList[1]:ReplaceNode(selectedNode, self.build.latestTree.nodes[selectedNode.id])
+			self.build.spec:ReplaceNode(selectedNode, self.build.spec.tree.nodes[selectedNode.id])
 			if selectedNode.conqueredBy.conqueror.type == "templar" then
-				self.specList[1]:NodeAdditionOrReplacementFromString(selectedNode,"+5 to Devotion")
+				self.build.spec:NodeAdditionOrReplacementFromString(selectedNode,"+5 to Devotion")
 			end
 		end
 		self.modFlag = true