Skip to content

Commit 713c234

Browse files
author
LocalIdentity
committed
Fixes
Fix jewel offset and node images Fix jewel search not working Update inactive node saturation to better match game
1 parent ab73fd2 commit 713c234

10 files changed

Lines changed: 101 additions & 57 deletions

File tree

src/Classes/PassiveSpec.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
10721072
jewelType = 3
10731073
elseif conqueredBy.conqueror.type == "templar" then
10741074
jewelType = 4
1075-
elseif conqueredBy.conqueror.type == "kalguuran" then
1075+
elseif conqueredBy.conqueror.type == "kalguur" then
10761076
jewelType = 6
10771077
end
10781078
local seed = conqueredBy.id
@@ -1220,7 +1220,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
12201220
elseif conqueredBy.conqueror.type == "maraketh" then
12211221
local dex = (isValueInArray(attributes, node.dn) or node.isTattoo) and "2" or "4"
12221222
self:NodeAdditionOrReplacementFromString(node, " \n+" .. dex .. " to Dexterity")
1223-
elseif conqueredBy.conqueror.type == "kalguuran" then
1223+
elseif conqueredBy.conqueror.type == "kalguur" then
12241224
local ward = (isValueInArray(attributes, node.dn) or node.isTattoo) and "1" or "2"
12251225
self:NodeAdditionOrReplacementFromString(node, " \n" .. ward .. "% increased Ward")
12261226
elseif conqueredBy.conqueror.type == "templar" then

src/Classes/PassiveTreeView.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +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")
51+
self.kalguur1 = NewImageHandle()
52+
self.kalguur1:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle1.png", "CLAMP")
53+
self.kalguur2 = NewImageHandle()
54+
self.kalguur2:Load("TreeData/PassiveSkillScreenKalguuranJewelCircle2.png", "CLAMP")
5555

5656
self.tooltip = new("Tooltip")
5757

@@ -939,8 +939,8 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
939939
self:DrawImageRotated(self.templar1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
940940
self:DrawImageRotated(self.templar2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
941941
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)
942+
self:DrawImageRotated(self.kalguur1, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
943+
self:DrawImageRotated(self.kalguur2, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)
944944
else
945945
self:DrawImageRotated(self.jewelShadedOuterRing, scrX, scrY, outerSize * 2, outerSize * 2, -0.7)
946946
self:DrawImageRotated(self.jewelShadedOuterRingFlipped, scrX, scrY, outerSize * 2, outerSize * 2, 0.7)

src/Classes/TimelessJewelListControl.lua

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,30 +94,28 @@ function TimelessJewelListControlClass:OnSelClick(index, data, doubleClick)
9494
local label = "[" .. data.seed .. "; " .. data.total.. "; " .. self.sharedList.socket.keystone .. "]\n"
9595
local variant = self.sharedList.conqueror.id == 1 and 1 or (self.sharedList.conqueror.id - 1) .. "\n"
9696
local itemData = [[
97-
Elegant Hubris ]] .. label .. [[
97+
Heroic Tragedy ]] .. label .. [[
9898
Timeless Jewel
9999
League: Legion
100-
Requires Level: 20
101-
Limited to: 1
102-
Variant: Cadiro (Supreme Decadence)
103-
Variant: Victario (Supreme Grandstanding)
104-
Variant: Caspiro (Supreme Ostentation)
100+
Limited to: 1 Historic
101+
Variant: Vorana (Black Scythe Training)
102+
Variant: Uhtred (The Unbreaking Circle)
103+
Variant: Medved (Celestial Mathematics)
105104
Selected Variant: ]] .. variant .. "\n" .. [[
106105
Radius: Large
107106
Implicits: 0
108-
{variant:1}Commissioned ]] .. data.seed .. [[ coins to commemorate Cadiro
109-
{variant:2}Commissioned ]] .. data.seed .. [[ coins to commemorate Victario
110-
{variant:3}Commissioned ]] .. data.seed .. [[ coins to commemorate Caspiro
111-
Passives in radius are Conquered by the Eternal Empire
107+
{variant:1}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Vorana
108+
{variant:2}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Uhtred
109+
{variant:3}Remembrancing ]] .. data.seed .. [[ songworthy deeds by the line of Medved
110+
Passives in radius are Conquered by the Kalguur
112111
Historic
113112
]]
114113
if self.sharedList.type.id == 1 then
115114
itemData = [[
116115
Glorious Vanity ]] .. label .. [[
117116
Timeless Jewel
118117
League: Legion
119-
Requires Level: 20
120-
Limited to: 1
118+
Limited to: 1 Historic
121119
Variant: Doryani (Corrupted Soul)
122120
Variant: Xibaqua (Divine Flesh)
123121
Variant: Ahuana (Immortal Ambition)
@@ -135,8 +133,7 @@ Historic
135133
Lethal Pride ]] .. label .. [[
136134
Timeless Jewel
137135
League: Legion
138-
Requires Level: 20
139-
Limited to: 1
136+
Limited to: 1 Historic
140137
Variant: Kaom (Strength of Blood)
141138
Variant: Rakiata (Tempered by War)
142139
Variant: Akoya (Chainbreaker)
@@ -154,8 +151,7 @@ Historic
154151
Brutal Restraint ]] .. label .. [[
155152
Timeless Jewel
156153
League: Legion
157-
Requires Level: 20
158-
Limited to: 1
154+
Limited to: 1 Historic
159155
Variant: Asenath (Dance with Death)
160156
Variant: Nasima (Second Sight)
161157
Variant: Balbala (The Traitor)
@@ -178,8 +174,7 @@ Historic
178174
Militant Faith ]] .. label .. [[
179175
Timeless Jewel
180176
League: Legion
181-
Requires Level: 20
182-
Limited to: 1
177+
Limited to: 1 Historic
183178
Has Alt Variant: true
184179
Has Alt Variant Two: true
185180
Variant: Avarius (Power of Purpose)
@@ -225,6 +220,24 @@ Implicits: 0
225220
{variant:18}3% increased Defences from Equipped Shield per 10 Devotion
226221
Passives in radius are Conquered by the Templars
227222
Historic
223+
]]
224+
elseif self.sharedList.type.id == 5 then
225+
itemData = [[
226+
Elegant Hubris ]] .. label .. [[
227+
Timeless Jewel
228+
League: Legion
229+
Limited to: 1 Historic
230+
Variant: Cadiro (Supreme Decadence)
231+
Variant: Victario (Supreme Grandstanding)
232+
Variant: Caspiro (Supreme Ostentation)
233+
Selected Variant: ]] .. variant .. "\n" .. [[
234+
Radius: Large
235+
Implicits: 0
236+
{variant:1}Commissioned ]] .. data.seed .. [[ coins to commemorate Cadiro
237+
{variant:2}Commissioned ]] .. data.seed .. [[ coins to commemorate Victario
238+
{variant:3}Commissioned ]] .. data.seed .. [[ coins to commemorate Caspiro
239+
Passives in radius are Conquered by the Eternal Empire
240+
Historic
228241
]]
229242
end
230243
local item = new("Item", itemData)

src/Classes/TreeTab.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ function TreeTabClass:FindTimelessJewel()
11551155
local timelessData = self.build.timelessData
11561156
local controls = { }
11571157
local modData = { }
1158-
local ignoredMods = { "Might of the Vaal", "Legacy of the Vaal", "Strength", "Add Strength", "Dex", "Add Dexterity", "Devotion", "Price of Glory" }
1158+
local ignoredMods = { "Might of the Vaal", "Legacy of the Vaal", "Strength", "Add Strength", "Dex", "Add Dexterity", "Devotion", "Price of Glory", "Ward" }
11591159
local totalMods = { [2] = "Strength", [3] = "Dexterity", [4] = "Devotion" }
11601160
local totalModIDs = {
11611161
["total_strength"] = { ["karui_notable_add_strength"] = true, ["karui_attribute_strength"] = true, ["karui_small_strength"] = true },
@@ -1179,7 +1179,7 @@ function TreeTabClass:FindTimelessJewel()
11791179
{ label = "Brutal Restraint", name = "maraketh", id = 3 },
11801180
{ label = "Militant Faith", name = "templar", id = 4 },
11811181
{ label = "Elegant Hubris", name = "eternal", id = 5 },
1182-
{ label = "Heroic Tragedy", name = "kalguuran", id = 6 }
1182+
{ label = "Heroic Tragedy", name = "kalguur", id = 6 }
11831183
}
11841184
-- rebuild `timelessData.jewelType` as we only store the minimum amount of `jewelType` data in build XML
11851185
if next(timelessData.jewelType) then

0 commit comments

Comments
 (0)