Skip to content

Commit a7e7533

Browse files
justjuanguijustjuangui
andauthored
Timeless jewel asset was added, Kalguur jewel circle was enabled, Passives Assets from TimeLess Jewel was added (#689)
Co-authored-by: justjuangui <servicios@juacarvajal.com>
1 parent af18e83 commit a7e7533

File tree

9 files changed

+92
-1
lines changed

9 files changed

+92
-1
lines changed

src/Classes/PassiveTreeView.lua

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,16 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
883883
DrawImage(self.jewelShadedInnerRingFlipped, keyX - innerSize, keyY - innerSize, innerSize * 2, innerSize * 2)
884884
end
885885
end
886+
elseif jewel.jewelData and jewel.jewelData.conqueredBy and jewel.jewelData.conqueredBy.conqueror and jewel.jewelData.conqueredBy.conqueror.type then
887+
local conqueror = jewel.jewelData.conqueredBy.conqueror.type
888+
if conqueror == "kalguur" then
889+
conqueror = "kalguuran"
890+
end
891+
892+
local circle1 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle1.dds")
893+
local circle2 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle2.dds")
894+
DrawImage(circle1.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle1))
895+
DrawImage(circle2.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle2))
886896
else
887897
DrawImage(self.jewelShadedOuterRing, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2)
888898
DrawImage(self.jewelShadedOuterRingFlipped, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2)

src/Export/Scripts/passivetree.lua

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ local sheets = {
372372
newSheet("oils", defaultMaxWidth, 100),
373373
newSheet("lines", defaultMaxWidth, 100),
374374
newSheet("jewelsockets", defaultMaxWidth, 100),
375+
newSheet("legion", defaultMaxWidth, 100),
375376
}
376377
local sheetLocations = {
377378
["skills"] = 1,
@@ -383,6 +384,7 @@ local sheetLocations = {
383384
["oils"] = 7,
384385
["lines"] = 8,
385386
["jewelsockets"] = 9,
387+
["legion"] = 10,
386388
}
387389
local function getSheet(sheetLocation)
388390
return sheets[sheetLocations[sheetLocation]]
@@ -505,6 +507,32 @@ for jewel in jewelArt:Rows() do
505507
addToSheet(getSheet("jewelsockets"), asset.path, "jewelpassive", commonMetadata(name))
506508
end
507509

510+
-- adding legion assets
511+
for legion in dat("AlternatePassiveSkills"):Rows() do
512+
addToSheet(getSheet("legion"), legion.DDSIcon, "legion", commonMetadata(legion.DDSIcon))
513+
end
514+
515+
516+
local artsToLegion = {
517+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenMarakethJewelCircle2",
518+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenKalguuranJewelCircle1",
519+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenKaruiJewelCircle2",
520+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenEternalEmpireJewelCircle1",
521+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenEternalEmpireJewelCircle2",
522+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenTemplarJewelCircle2",
523+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenTemplarJewelCircle1",
524+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenVaalJewelCircle2",
525+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenKalguuranJewelCircle2",
526+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenKaruiJewelCircle1",
527+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenVaalJewelCircle1",
528+
"Art/2DArt/UIImages/InGame/PassiveSkillScreenMarakethJewelCircle1"
529+
}
530+
531+
for _, art in ipairs(artsToLegion) do
532+
local asset = uiImages[string.lower(art)]
533+
addToSheet(getSheet("legion"), asset.path, "legion", commonMetadata(asset.path))
534+
end
535+
508536
local tree = {
509537
["tree"] = idPassiveTree,
510538
["min_x"]= 0,
254 KB
Binary file not shown.
1.09 MB
Binary file not shown.
539 KB
Binary file not shown.
8.44 KB
Binary file not shown.
84.9 KB
Binary file not shown.

src/TreeData/0_1/tree.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/TreeData/0_1/tree.lua

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,59 @@ return {
327327
["Time-Lost Sapphire"]=4,
328328
["Timeless Jewel"]=4
329329
},
330+
["legion_128_128_BC1.dds.zst"]={
331+
["Art/2DArt/SkillIcons/passives/CorruptedDefences.dds"]=24,
332+
["Art/2DArt/SkillIcons/passives/DevotionNotable.dds"]=11,
333+
["Art/2DArt/SkillIcons/passives/DivineFlesh.dds"]=23,
334+
["Art/2DArt/SkillIcons/passives/EternalEmpireDefensiveNotable.dds"]=5,
335+
["Art/2DArt/SkillIcons/passives/EternalEmpireOffensiveNotable.dds"]=26,
336+
["Art/2DArt/SkillIcons/passives/EternalYouth.dds"]=19,
337+
["Art/2DArt/SkillIcons/passives/FocusedRage.dds"]=4,
338+
["Art/2DArt/SkillIcons/passives/GlancingBlows.dds"]=15,
339+
["Art/2DArt/SkillIcons/passives/InnerConviction.dds"]=7,
340+
["Art/2DArt/SkillIcons/passives/KalguuranDexKeystone.dds"]=31,
341+
["Art/2DArt/SkillIcons/passives/KalguuranDexNotable.dds"]=14,
342+
["Art/2DArt/SkillIcons/passives/KalguuranIntKeystone.dds"]=3,
343+
["Art/2DArt/SkillIcons/passives/KalguuranIntNotable.dds"]=13,
344+
["Art/2DArt/SkillIcons/passives/KalguuranStrKeystone.dds"]=30,
345+
["Art/2DArt/SkillIcons/passives/KalguuranStrNotable.dds"]=17,
346+
["Art/2DArt/SkillIcons/passives/MiracleMaker.dds"]=25,
347+
["Art/2DArt/SkillIcons/passives/OasisKeystone.dds"]=16,
348+
["Art/2DArt/SkillIcons/passives/PowerOfPurpose.dds"]=10,
349+
["Art/2DArt/SkillIcons/passives/SharpandBrittle.dds"]=21,
350+
["Art/2DArt/SkillIcons/passives/SoulTetherKeystone.dds"]=18,
351+
["Art/2DArt/SkillIcons/passives/StrengthOfBlood.dds"]=12,
352+
["Art/2DArt/SkillIcons/passives/SupremeDecadence.dds"]=20,
353+
["Art/2DArt/SkillIcons/passives/SupremeEgo.dds"]=2,
354+
["Art/2DArt/SkillIcons/passives/SupremeGrandstand.dds"]=6,
355+
["Art/2DArt/SkillIcons/passives/SupremeProdigy.dds"]=29,
356+
["Art/2DArt/SkillIcons/passives/TemperedByWar.dds"]=8,
357+
["Art/2DArt/SkillIcons/passives/TheBlindMonk.dds"]=1,
358+
["Art/2DArt/SkillIcons/passives/TranscendenceKeystone.dds"]=9,
359+
["Art/2DArt/SkillIcons/passives/VaalNotableDefensive.dds"]=22,
360+
["Art/2DArt/SkillIcons/passives/VaalNotableOffensive.dds"]=27,
361+
["Art/2DArt/SkillIcons/passives/WindDancer.dds"]=28
362+
},
363+
["legion_564_564_BC7.dds.zst"]={
364+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreeneternalempirejewelcircle1.dds"]=9,
365+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreeneternalempirejewelcircle2.dds"]=8,
366+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkalguuranjewelcircle1.dds"]=10,
367+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkalguuranjewelcircle2.dds"]=5,
368+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkaruijewelcircle1.dds"]=4,
369+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenkaruijewelcircle2.dds"]=12,
370+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenmarakethjewelcircle1.dds"]=2,
371+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenmarakethjewelcircle2.dds"]=1,
372+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreentemplarjewelcircle1.dds"]=6,
373+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreentemplarjewelcircle2.dds"]=7,
374+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenvaaljewelcircle1.dds"]=3,
375+
["art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreenvaaljewelcircle2.dds"]=11
376+
},
377+
["legion_64_64_BC1.dds.zst"]={
378+
["Art/2DArt/SkillIcons/passives/DevotionNode.dds"]=3,
379+
["Art/2DArt/SkillIcons/passives/EternalEmpireBlank.dds"]=4,
380+
["Art/2DArt/SkillIcons/passives/VaalDefensive.dds"]=1,
381+
["Art/2DArt/SkillIcons/passives/VaalOffensive.dds"]=2
382+
},
330383
["lines_1436_1436_BC7.dds.zst"]={
331384
CurvesActive=3,
332385
CurvesIntermediate=2,

0 commit comments

Comments
 (0)