Skip to content

Commit d998e91

Browse files
author
LocalIdentity
committed
Handle new Timeless jewel
Adds support across the codebase to support the new timeless jewel with a new index and ring assets
1 parent 3acd910 commit d998e91

11 files changed

Lines changed: 1760 additions & 418 deletions

File tree

manifest.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exclude-directories =
1111
[program]
1212
path = src
1313
exclude-files = HeadlessWrapper.lua,LaunchInstall.lua,Settings.xml
14-
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
14+
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
1515

1616
[tree]
1717
path = src

src/Classes/PassiveSpec.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
10721072
jewelType = 3
10731073
elseif conqueredBy.conqueror.type == "templar" then
10741074
jewelType = 4
1075+
elseif conqueredBy.conqueror.type == "kalguuran" then
1076+
jewelType = 6
10751077
end
10761078
local seed = conqueredBy.id
10771079
if jewelType == 5 then
@@ -1218,6 +1220,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
12181220
elseif conqueredBy.conqueror.type == "maraketh" then
12191221
local dex = (isValueInArray(attributes, node.dn) or node.isTattoo) and "2" or "4"
12201222
self:NodeAdditionOrReplacementFromString(node, " \n+" .. dex .. " to Dexterity")
1223+
elseif conqueredBy.conqueror.type == "kalguuran" then
1224+
local ward = (isValueInArray(attributes, node.dn) or node.isTattoo) and "1" or "2"
1225+
self:NodeAdditionOrReplacementFromString(node, " \n" .. ward .. "% increased Ward")
12211226
elseif conqueredBy.conqueror.type == "templar" then
12221227
if (isValueInArray(attributes, node.dn) or node.isTattoo) then
12231228
local legionNode = legionNodes[91] -- templar_devotion_node

src/Classes/PassiveTreeView.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ local PassiveTreeViewClass = newClass("PassiveTreeView", function(self)
4848
self.vaal1:Load("TreeData/PassiveSkillScreenVaalJewelCircle1.png", "CLAMP")
4949
self.vaal2 = NewImageHandle()
5050
self.vaal2:Load("TreeData/PassiveSkillScreenVaalJewelCircle2.png", "CLAMP")
51+
self.kalguuran1 = NewImageHandle()
52+
self.kalguuran1:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle1.png", "CLAMP")
53+
self.kalguuran2 = NewImageHandle()
54+
self.kalguuran2:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle2.png", "CLAMP")
5155

5256
self.tooltip = new("Tooltip")
5357

@@ -934,6 +938,9 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
934938
elseif jewel.title:match("^Militant Faith") then
935939
self:DrawImageRotated(self.templar1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
936940
self:DrawImageRotated(self.templar2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
941+
elseif jewel.title:match("^Heroic Tragedy") then
942+
self:DrawImageRotated(self.kalguuran1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
943+
self:DrawImageRotated(self.kalguuran2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
937944
else
938945
self:DrawImageRotated(self.jewelShadedOuterRing, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
939946
self:DrawImageRotated(self.jewelShadedOuterRingFlipped, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)

src/Classes/TreeTab.lua

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,8 @@ function TreeTabClass:FindTimelessJewel()
11781178
{ label = "Lethal Pride", name = "karui", id = 2 },
11791179
{ label = "Brutal Restraint", name = "maraketh", id = 3 },
11801180
{ label = "Militant Faith", name = "templar", id = 4 },
1181-
{ label = "Elegant Hubris", name = "eternal", id = 5 }
1181+
{ label = "Elegant Hubris", name = "eternal", id = 5 },
1182+
{ label = "Heroic Tragedy", name = "kalguuran", id = 6 }
11821183
}
11831184
-- rebuild `timelessData.jewelType` as we only store the minimum amount of `jewelType` data in build XML
11841185
if next(timelessData.jewelType) then
@@ -1221,6 +1222,12 @@ function TreeTabClass:FindTimelessJewel()
12211222
{ label = "Cadiro (Supreme Decadence)", id = 2 },
12221223
{ label = "Victario (Supreme Grandstanding)", id = 3 },
12231224
{ label = "Caspiro (Supreme Ostentation)", id = 4 }
1225+
},
1226+
[6] = {
1227+
{ label = "Any", id = 1 },
1228+
{ label = "Vorana (Black Scythe Training)", id = 2 },
1229+
{ label = "Uhtred (The Unbreaking Circle)", id = 3 },
1230+
{ label = "Medved (Celestial Mathematics)", id = 4 }
12241231
}
12251232
}
12261233
-- rebuild `timelessData.conquerorType` as we only store the minimum amount of `conquerorType` data in build XML

0 commit comments

Comments
 (0)