Timeless jewel asset was added, Kalguur jewel circle was enabled, Passives Assets from TimeLess Jewel was added (#689)

Co-authored-by: justjuangui <[email protected]>

Author: justjuangui

src/Classes/PassiveTreeView.lua

@@ -883,6 +883,16 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
 								DrawImage(self.jewelShadedInnerRingFlipped, keyX - innerSize, keyY - innerSize, innerSize * 2, innerSize * 2)
 							end
 						end
+					elseif jewel.jewelData and jewel.jewelData.conqueredBy and jewel.jewelData.conqueredBy.conqueror and jewel.jewelData.conqueredBy.conqueror.type then
+						local conqueror = jewel.jewelData.conqueredBy.conqueror.type
+						if conqueror == "kalguur" then
+							conqueror = "kalguuran"
+						end
+
+						local circle1 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle1.dds")
+						local circle2 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle2.dds")
+						DrawImage(circle1.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle1))
+						DrawImage(circle2.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle2))
 					else
 						DrawImage(self.jewelShadedOuterRing, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2)
 						DrawImage(self.jewelShadedOuterRingFlipped, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2)

src/Export/Scripts/passivetree.lua

@@ -372,6 +372,7 @@ local sheets = {
 	newSheet("oils", defaultMaxWidth, 100),
 	newSheet("lines", defaultMaxWidth, 100),
 	newSheet("jewelsockets", defaultMaxWidth, 100),
+	newSheet("legion", defaultMaxWidth, 100),
 }
 local sheetLocations = {
 	["skills"] = 1,
@@ -383,6 +384,7 @@ local sheetLocations = {
 	["oils"] = 7,
 	["lines"] = 8,
 	["jewelsockets"] = 9,
+	["legion"] = 10,
 }
 local function getSheet(sheetLocation)
 	return sheets[sheetLocations[sheetLocation]]
@@ -505,6 +507,32 @@ for jewel in jewelArt:Rows() do
 	addToSheet(getSheet("jewelsockets"), asset.path, "jewelpassive", commonMetadata(name))
 end
 
+-- adding legion assets
+for legion in dat("AlternatePassiveSkills"):Rows() do
+	addToSheet(getSheet("legion"), legion.DDSIcon, "legion", commonMetadata(legion.DDSIcon))
+end
+
+
+local artsToLegion = {
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenMarakethJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenKalguuranJewelCircle1",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenKaruiJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenEternalEmpireJewelCircle1",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenEternalEmpireJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenTemplarJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenTemplarJewelCircle1",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenVaalJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenKalguuranJewelCircle2",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenKaruiJewelCircle1",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenVaalJewelCircle1",
+	"Art/2DArt/UIImages/InGame/PassiveSkillScreenMarakethJewelCircle1"
+}
+
+for _, art in ipairs(artsToLegion) do
+	local asset = uiImages[string.lower(art)]
+	addToSheet(getSheet("legion"), asset.path, "legion", commonMetadata(asset.path))
+end
+
 local tree = {
 	["tree"] = idPassiveTree,
 	["min_x"]= 0,

src/TreeData/0_1/legion_128_128_BC1.dds.zst

@@ -327,6 +327,59 @@ return {
 			["Time-Lost Sapphire"]=4,
 			["Timeless Jewel"]=4
 		},
+		["legion_128_128_BC1.dds.zst"]={
+			["Art/2DArt/SkillIcons/passives/CorruptedDefences.dds"]=24,
+			["Art/2DArt/SkillIcons/passives/DevotionNotable.dds"]=11,
+			["Art/2DArt/SkillIcons/passives/DivineFlesh.dds"]=23,
+			["Art/2DArt/SkillIcons/passives/EternalEmpireDefensiveNotable.dds"]=5,
+			["Art/2DArt/SkillIcons/passives/EternalEmpireOffensiveNotable.dds"]=26,
+			["Art/2DArt/SkillIcons/passives/EternalYouth.dds"]=19,
+			["Art/2DArt/SkillIcons/passives/FocusedRage.dds"]=4,
+			["Art/2DArt/SkillIcons/passives/GlancingBlows.dds"]=15,
+			["Art/2DArt/SkillIcons/passives/InnerConviction.dds"]=7,
+			["Art/2DArt/SkillIcons/passives/KalguuranDexKeystone.dds"]=31,
+			["Art/2DArt/SkillIcons/passives/KalguuranDexNotable.dds"]=14,
+			["Art/2DArt/SkillIcons/passives/KalguuranIntKeystone.dds"]=3,
+			["Art/2DArt/SkillIcons/passives/KalguuranIntNotable.dds"]=13,
+			["Art/2DArt/SkillIcons/passives/KalguuranStrKeystone.dds"]=30,
+			["Art/2DArt/SkillIcons/passives/KalguuranStrNotable.dds"]=17,
+			["Art/2DArt/SkillIcons/passives/MiracleMaker.dds"]=25,
+			["Art/2DArt/SkillIcons/passives/OasisKeystone.dds"]=16,
+			["Art/2DArt/SkillIcons/passives/PowerOfPurpose.dds"]=10,
+			["Art/2DArt/SkillIcons/passives/SharpandBrittle.dds"]=21,
+			["Art/2DArt/SkillIcons/passives/SoulTetherKeystone.dds"]=18,
+			["Art/2DArt/SkillIcons/passives/StrengthOfBlood.dds"]=12,
+			["Art/2DArt/SkillIcons/passives/SupremeDecadence.dds"]=20,
+			["Art/2DArt/SkillIcons/passives/SupremeEgo.dds"]=2,
+			["Art/2DArt/SkillIcons/passives/SupremeGrandstand.dds"]=6,
+			["Art/2DArt/SkillIcons/passives/SupremeProdigy.dds"]=29,
+			["Art/2DArt/SkillIcons/passives/TemperedByWar.dds"]=8,
+			["Art/2DArt/SkillIcons/passives/TheBlindMonk.dds"]=1,
+			["Art/2DArt/SkillIcons/passives/TranscendenceKeystone.dds"]=9,
+			["Art/2DArt/SkillIcons/passives/VaalNotableDefensive.dds"]=22,
+			["Art/2DArt/SkillIcons/passives/VaalNotableOffensive.dds"]=27,
+			["Art/2DArt/SkillIcons/passives/WindDancer.dds"]=28
+		},
+		["legion_564_564_BC7.dds.zst"]={
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreeneternalempirejewelcircle1.dds"]=9,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreeneternalempirejewelcircle2.dds"]=8,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkalguuranjewelcircle1.dds"]=10,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkalguuranjewelcircle2.dds"]=5,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkaruijewelcircle1.dds"]=4,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkaruijewelcircle2.dds"]=12,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenmarakethjewelcircle1.dds"]=2,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenmarakethjewelcircle2.dds"]=1,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreentemplarjewelcircle1.dds"]=6,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreentemplarjewelcircle2.dds"]=7,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenvaaljewelcircle1.dds"]=3,
+			["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenvaaljewelcircle2.dds"]=11
+		},
+		["legion_64_64_BC1.dds.zst"]={
+			["Art/2DArt/SkillIcons/passives/DevotionNode.dds"]=3,
+			["Art/2DArt/SkillIcons/passives/EternalEmpireBlank.dds"]=4,
+			["Art/2DArt/SkillIcons/passives/VaalDefensive.dds"]=1,
+			["Art/2DArt/SkillIcons/passives/VaalOffensive.dds"]=2
+		},
 		["lines_1436_1436_BC7.dds.zst"]={
 			CurvesActive=3,
 			CurvesIntermediate=2,