Merge branch 'dev' into flavour-text-3.28

Author: LocalIdentity

manifest.cfg

@@ -11,7 +11,7 @@ exclude-directories =
 [program]
 path = src
 exclude-files = HeadlessWrapper.lua,LaunchInstall.lua,Settings.xml
-exclude-directories = src/Export,src/TreeData,src/Builds,src/luacov.stats.out,src/Data/TimelessJewelData/BrutalRestraint.bin,src/Data/TimelessJewelData/ElegantHubris.bin,src/Data/TimelessJewelData/GloriousVanity.bin,src/Data/TimelessJewelData/LethalPride.bin,src/Data/TimelessJewelData/MilitantFaith.bin
+exclude-directories = src/Export,src/TreeData,src/Builds,src/luacov.stats.out,src/Data/TimelessJewelData/BrutalRestraint.bin,src/Data/TimelessJewelData/ElegantHubris.bin,src/Data/TimelessJewelData/GloriousVanity.bin,src/Data/TimelessJewelData/LethalPride.bin,src/Data/TimelessJewelData/MilitantFaith.bin,src/Data/TimelessJewelData/HeroicTragedy.bin
 
 [tree]
 path = src

src/Classes/PassiveSpec.lua

@@ -1072,6 +1072,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 				jewelType = 3
 			elseif conqueredBy.conqueror.type == "templar" then
 				jewelType = 4
+			elseif conqueredBy.conqueror.type == "kalguur" then
+				jewelType = 6
 			end
 			local seed = conqueredBy.id
 			if jewelType == 5 then
@@ -1218,6 +1220,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 				elseif conqueredBy.conqueror.type == "maraketh" then
 					local dex = (isValueInArray(attributes, node.dn) or node.isTattoo) and "2" or "4"
 					self:NodeAdditionOrReplacementFromString(node, " \n+" .. dex .. " to Dexterity")
+				elseif conqueredBy.conqueror.type == "kalguur" then
+					local ward = (isValueInArray(attributes, node.dn) or node.isTattoo) and "1" or "2"
+					self:NodeAdditionOrReplacementFromString(node, " \n" .. ward .. "% increased Ward")
 				elseif conqueredBy.conqueror.type == "templar" then
 					if (isValueInArray(attributes, node.dn) or node.isTattoo) then
 						local legionNode = legionNodes[91] -- templar_devotion_node
@@ -1237,6 +1242,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 	-- Add selected mastery effect mods to mastery nodes
 	self.allocatedMasteryCount = 0
 	self.allocatedNotableCount = 0
+	self.allocatedKeystoneCount = 0
 	self.allocatedMasteryTypes = { }
 	self.allocatedMasteryTypeCount = 0
 	self.allocatedTattooTypes = { }
@@ -1279,6 +1285,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 				self:AddMasteryEffectOptionsToNode(node)
 			elseif node.type == "Notable" and node.alloc then
 				self.allocatedNotableCount = self.allocatedNotableCount + 1
+			elseif node.type == "Keystone" and node.alloc then
+				self.allocatedKeystoneCount = self.allocatedKeystoneCount + 1	
 			end
 			if node.isTattoo and node.alloc and node.overrideType then
 				if not self.allocatedTattooTypes[node.overrideType] then

src/Classes/PassiveTree.lua

@@ -117,7 +117,9 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 				classId = classId,
 				class = class,
 				ascendClassId = ascendClassId,
-				ascendClass = ascendClass
+				ascendClass = ascendClass,
+				flavourText = ascendClass.flavourText,
+				flavourTextRect = ascendClass.flavourTextRect,
 			}
 		end
 	end
@@ -179,7 +181,9 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 				classId = "alternate_ascendancies",
 				class = alternate_ascendancies_class,
 				ascendClassId = ascendClassId,
-				ascendClass = ascendClass
+				ascendClass = ascendClass,
+				flavourText = ascendClass.flavourText,
+				flavourTextRect = ascendClass.flavourTextRect,
 			}
 			self.secondaryAscendNameMap[ascendClass.id] = self.ascendNameMap[ascendClass.id]
 		end

src/Classes/PassiveTreeView.lua

@@ -48,6 +48,10 @@ local PassiveTreeViewClass = newClass("PassiveTreeView", function(self)
 	self.vaal1:Load("TreeData/PassiveSkillScreenVaalJewelCircle1.png", "CLAMP")
 	self.vaal2 = NewImageHandle()
 	self.vaal2:Load("TreeData/PassiveSkillScreenVaalJewelCircle2.png", "CLAMP")
+	self.kalguur1 = NewImageHandle()
+	self.kalguur1:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle1.png", "CLAMP")
+	self.kalguur2 = NewImageHandle()
+	self.kalguur2:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle2.png", "CLAMP")
 
 	self.tooltip = new("Tooltip")
 
@@ -464,6 +468,46 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					SetDrawColor(1, 1, 1, 0.25)
 				end
 				self:DrawAsset(tree.assets["Classes"..group.ascendancyName], scrX, scrY, scale)
+
+				if tree.classes[1].ascendancies then
+					local ascendancyData
+					local isAlternateAscendancy = false
+					-- Search normal ascendancies
+					for _, class in ipairs(tree.classes) do
+						for _, ascendancy in ipairs(class.ascendancies) do
+							if ascendancy.id == group.ascendancyName then
+								ascendancyData = ascendancy
+								break
+							end
+						end
+						if ascendancyData then break end
+					end
+
+					-- Search alternate ascendancies if not found
+					if not ascendancyData and tree.alternate_ascendancies then
+						for _, ascendancy in pairs(tree.alternate_ascendancies) do
+							if ascendancy.id == group.ascendancyName then
+								ascendancyData = ascendancy
+								isAlternateAscendancy = true
+								break
+							end
+						end
+					end
+					if ascendancyData and ascendancyData.flavourTextRect then
+						local rect = ascendancyData.flavourTextRect
+						local textColor = "^x" .. ascendancyData.flavourTextColour
+
+						-- Normal ascendancy images are 1300x1300, bloodline appears to be 1488x1412
+						local offsetX = rect.x - (isAlternateAscendancy and 744 or 650)
+						local offsetY = rect.y - (isAlternateAscendancy and 706 or 650)
+
+						local textX, textY = treeToScreen(group.x + offsetX, group.y + offsetY)
+
+						DrawString(textX, textY, "LEFT", 52 * scale, "FONTIN ITALIC", textColor .. ascendancyData.flavourText)
+					end
+				else
+					ConPrintTable(tree.classes)
+				end
 				SetDrawColor(1, 1, 1)
 			end
 		elseif group.oo[3] then
@@ -934,6 +978,9 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 					elseif jewel.title:match("^Militant Faith") then
 						self:DrawImageRotated(self.templar1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
 						self:DrawImageRotated(self.templar2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
+					elseif jewel.title:match("^Heroic Tragedy") then
+						self:DrawImageRotated(self.kalguur1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
+						self:DrawImageRotated(self.kalguur2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
 					else
 						self:DrawImageRotated(self.jewelShadedOuterRing, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
 						self:DrawImageRotated(self.jewelShadedOuterRingFlipped, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)

src/Classes/TimelessJewelListControl.lua

@@ -94,30 +94,28 @@ function TimelessJewelListControlClass:OnSelClick(index, data, doubleClick)
 		local label = "[" .. data.seed .. "; " .. data.total.. "; " .. self.sharedList.socket.keystone .. "]\n"
 		local variant = self.sharedList.conqueror.id == 1 and 1 or (self.sharedList.conqueror.id - 1) .. "\n"
 		local itemData = [[
-Elegant Hubris ]] .. label .. [[
+Heroic Tragedy ]] .. label .. [[
 Timeless Jewel
 League: Legion
-Requires Level: 20
-Limited to: 1
-Variant: Cadiro (Supreme Decadence)
-Variant: Victario (Supreme Grandstanding)
-Variant: Caspiro (Supreme Ostentation)
+Limited to: 1 Historic
+Variant: Vorana (Black Scythe Training)
+Variant: Uhtred (The Unbreaking Circle)
+Variant: Medved (Celestial Mathematics)
 Selected Variant:  ]] .. variant .. "\n" .. [[
 Radius: Large
 Implicits: 0
-{variant:1}Commissioned ]] .. data.seed .. [[ coins to commemorate Cadiro
-{variant:2}Commissioned ]] .. data.seed .. [[ coins to commemorate Victario
-{variant:3}Commissioned ]] .. data.seed .. [[ coins to commemorate Caspiro
-Passives in radius are Conquered by the Eternal Empire
+{variant:1}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Vorana
+{variant:2}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Uhtred
+{variant:3}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Medved
+Passives in radius are Conquered by the Kalguur
 Historic
 ]]
 		if self.sharedList.type.id == 1 then
 			itemData = [[
 Glorious Vanity ]] .. label .. [[
 Timeless Jewel
 League: Legion
-Requires Level: 20
-Limited to: 1
+Limited to: 1 Historic
 Variant: Doryani (Corrupted Soul)
 Variant: Xibaqua (Divine Flesh)
 Variant: Ahuana (Immortal Ambition)
@@ -135,8 +133,7 @@ Historic
 Lethal Pride ]] .. label .. [[
 Timeless Jewel
 League: Legion
-Requires Level: 20
-Limited to: 1
+Limited to: 1 Historic
 Variant: Kaom (Strength of Blood)
 Variant: Rakiata (Tempered by War)
 Variant: Akoya (Chainbreaker)
@@ -154,8 +151,7 @@ Historic
 Brutal Restraint ]] .. label .. [[
 Timeless Jewel
 League: Legion
-Requires Level: 20
-Limited to: 1
+Limited to: 1 Historic
 Variant: Asenath (Dance with Death)
 Variant: Nasima (Second Sight)
 Variant: Balbala (The Traitor)
@@ -178,8 +174,7 @@ Historic
 Militant Faith ]] .. label .. [[
 Timeless Jewel
 League: Legion
-Requires Level: 20
-Limited to: 1
+Limited to: 1 Historic
 Has Alt Variant: true
 Has Alt Variant Two: true
 Variant: Avarius (Power of Purpose)
@@ -225,6 +220,24 @@ Implicits: 0
 {variant:18}3% increased Defences from Equipped Shield per 10 Devotion
 Passives in radius are Conquered by the Templars
 Historic
+]]
+			elseif self.sharedList.type.id == 5 then
+			itemData = [[
+Elegant Hubris ]] .. label .. [[
+Timeless Jewel
+League: Legion
+Limited to: 1 Historic
+Variant: Cadiro (Supreme Decadence)
+Variant: Victario (Supreme Grandstanding)
+Variant: Caspiro (Supreme Ostentation)
+Selected Variant:  ]] .. variant .. "\n" .. [[
+Radius: Large
+Implicits: 0
+{variant:1}Commissioned ]] .. data.seed .. [[ coins to commemorate Cadiro
+{variant:2}Commissioned ]] .. data.seed .. [[ coins to commemorate Victario
+{variant:3}Commissioned ]] .. data.seed .. [[ coins to commemorate Caspiro
+Passives in radius are Conquered by the Eternal Empire
+Historic
 ]]
 		end
 		local item = new("Item", itemData)

src/Classes/TreeTab.lua

@@ -1155,7 +1155,7 @@ function TreeTabClass:FindTimelessJewel()
 	local timelessData = self.build.timelessData
 	local controls = { }
 	local modData = { }
-	local ignoredMods = { "Might of the Vaal", "Legacy of the Vaal", "Strength", "Add Strength", "Dex", "Add Dexterity", "Devotion", "Price of Glory" }
+	local ignoredMods = { "Might of the Vaal", "Legacy of the Vaal", "Strength", "Add Strength", "Dex", "Add Dexterity", "Devotion", "Price of Glory", "Ward" }
 	local totalMods = { [2] = "Strength", [3] = "Dexterity", [4] = "Devotion" }
 	local totalModIDs = {
 		["total_strength"] = { ["karui_notable_add_strength"] = true, ["karui_attribute_strength"] = true, ["karui_small_strength"] = true },
@@ -1178,7 +1178,8 @@ function TreeTabClass:FindTimelessJewel()
 		{ label = "Lethal Pride", name = "karui", id = 2 },
 		{ label = "Brutal Restraint", name = "maraketh", id = 3 },
 		{ label = "Militant Faith", name = "templar", id = 4 },
-		{ label = "Elegant Hubris", name = "eternal", id = 5 }
+		{ label = "Elegant Hubris", name = "eternal", id = 5 },
+		{ label = "Heroic Tragedy", name = "kalguur", id = 6 }
 	}
 	-- rebuild `timelessData.jewelType` as we only store the minimum amount of `jewelType` data in build XML
 	if next(timelessData.jewelType) then
@@ -1221,6 +1222,12 @@ function TreeTabClass:FindTimelessJewel()
 			{ label = "Cadiro (Supreme Decadence)", id = 2 },
 			{ label = "Victario (Supreme Grandstanding)", id = 3 },
 			{ label = "Caspiro (Supreme Ostentation)", id = 4 }
+		},
+		[6] = {
+			{ label = "Any", id = 1 },
+			{ label = "Vorana (Black Scythe Training)", id = 2 },
+			{ label = "Uhtred (The Unbreaking Circle)", id = 3 },
+			{ label = "Medved (Celestial Mathematics)", id = 4 }
 		}
 	}
 	-- rebuild `timelessData.conquerorType` as we only store the minimum amount of `conquerorType` data in build XML