From 9f36d0e8e76738be977b77453f56a97dee365bb1 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Thu, 9 Oct 2025 01:34:16 -0500 Subject: [PATCH 1/4] Add gold respec to node tooltips and tree comparison --- src/Classes/PassiveTreeView.lua | 8 + src/Classes/TreeTab.lua | 14 +- src/Data/GoldRespecPrices.lua | 305 ++++++++++++++++++++++++ src/Export/Scripts/goldRespecPrices.lua | 19 ++ src/Modules/Data.lua | 2 + 5 files changed, 344 insertions(+), 4 deletions(-) create mode 100644 src/Data/GoldRespecPrices.lua create mode 100644 src/Export/Scripts/goldRespecPrices.lua diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua index b781794cc2..50dbd303e4 100644 --- a/src/Classes/PassiveTreeView.lua +++ b/src/Classes/PassiveTreeView.lua @@ -1458,9 +1458,17 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi end end end + local goldCost = data.goldRespecPrices[build.characterLevel].Cost + if node.ascendancyName then + goldCost = goldCost * 5 + end if node.depends and #node.depends > 1 then tooltip:AddSeparator(14) tooltip:AddLine(14, "^7"..#node.depends .. " points gained from unallocating these nodes") + tooltip:AddLine(14, "^xFFD700"..(#node.depends * goldCost) .. " Gold ^7required to unallocate these nodes") + tooltip:AddLine(14, colorCodes.TIP) + elseif node.alloc then + tooltip:AddLine(14, "^xFFD700"..(#node.depends * goldCost) .. " Gold ^7required to unallocate this node") tooltip:AddLine(14, colorCodes.TIP) end diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua index 5fb65dbf4a..80183b2edc 100644 --- a/src/Classes/TreeTab.lua +++ b/src/Classes/TreeTab.lua @@ -68,24 +68,30 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build) end if spec.curClassId == self.build.spec.curClassId then local respec = 0 + local respecAscendancy = 0 for nodeId, node in pairs(self.build.spec.allocNodes) do -- Assumption: Nodes >= 65536 are small cluster passives. if node.type ~= "ClassStart" and node.type ~= "AscendClassStart" and (self.build.spec.tree.clusterNodeMap[node.dn] == nil or node.isKeystone or node.isJewelSocket) and nodeId < 65536 and not spec.allocNodes[nodeId] then if node.ascendancyName then - respec = respec + 5 + respecAscendancy = respecAscendancy + 1 else respec = respec + 1 end end end - if respec > 0 then - tooltip:AddLine(16, "^7Switching to this tree requires "..respec.." refund points.") + if respec > 0 or respecAscendancy > 0 then + local goldCost = data.goldRespecPrices[build.characterLevel].Cost + tooltip:AddLine(16, "^xFFD700"..(respec * goldCost) .. " Gold ^7required to switch to this tree.") + local nodeWord = respec == 1 and "node differs" or "nodes differ" + local ascendWord = respecAscendancy == 1 and "node differs" or "nodes differ" + tooltip:AddLine(16, string.format("^7\t%d Passive %s from your current tree.", respec, nodeWord)) + tooltip:AddLine(16, string.format("^7\t%d Ascendancy %s from your current tree.", respecAscendancy, ascendWord)) end end end - tooltip:AddLine(16, "Game Version: "..treeVersions[spec.treeVersion].display) + tooltip:AddLine(16, "^7Game Version: "..treeVersions[spec.treeVersion].display) end end end diff --git a/src/Data/GoldRespecPrices.lua b/src/Data/GoldRespecPrices.lua new file mode 100644 index 0000000000..870baccaf4 --- /dev/null +++ b/src/Data/GoldRespecPrices.lua @@ -0,0 +1,305 @@ +-- This file is automatically generated, do not edit! +-- Skill costs data (c) Grinding Gear Games + +return { + [1] = { + Cost = 15, + }, + [2] = { + Cost = 19, + }, + [3] = { + Cost = 25, + }, + [4] = { + Cost = 31, + }, + [5] = { + Cost = 39, + }, + [6] = { + Cost = 46, + }, + [7] = { + Cost = 60, + }, + [8] = { + Cost = 73, + }, + [9] = { + Cost = 85, + }, + [10] = { + Cost = 98, + }, + [11] = { + Cost = 113, + }, + [12] = { + Cost = 128, + }, + [13] = { + Cost = 145, + }, + [14] = { + Cost = 163, + }, + [15] = { + Cost = 182, + }, + [16] = { + Cost = 211, + }, + [17] = { + Cost = 225, + }, + [18] = { + Cost = 241, + }, + [19] = { + Cost = 257, + }, + [20] = { + Cost = 273, + }, + [21] = { + Cost = 290, + }, + [22] = { + Cost = 308, + }, + [23] = { + Cost = 326, + }, + [24] = { + Cost = 344, + }, + [25] = { + Cost = 364, + }, + [26] = { + Cost = 384, + }, + [27] = { + Cost = 404, + }, + [28] = { + Cost = 425, + }, + [29] = { + Cost = 447, + }, + [30] = { + Cost = 470, + }, + [31] = { + Cost = 493, + }, + [32] = { + Cost = 517, + }, + [33] = { + Cost = 542, + }, + [34] = { + Cost = 567, + }, + [35] = { + Cost = 593, + }, + [36] = { + Cost = 620, + }, + [37] = { + Cost = 648, + }, + [38] = { + Cost = 676, + }, + [39] = { + Cost = 706, + }, + [40] = { + Cost = 736, + }, + [41] = { + Cost = 767, + }, + [42] = { + Cost = 799, + }, + [43] = { + Cost = 832, + }, + [44] = { + Cost = 866, + }, + [45] = { + Cost = 900, + }, + [46] = { + Cost = 936, + }, + [47] = { + Cost = 973, + }, + [48] = { + Cost = 1010, + }, + [49] = { + Cost = 1049, + }, + [50] = { + Cost = 1089, + }, + [51] = { + Cost = 1130, + }, + [52] = { + Cost = 1172, + }, + [53] = { + Cost = 1215, + }, + [54] = { + Cost = 1259, + }, + [55] = { + Cost = 1304, + }, + [56] = { + Cost = 1351, + }, + [57] = { + Cost = 1399, + }, + [58] = { + Cost = 1448, + }, + [59] = { + Cost = 1498, + }, + [60] = { + Cost = 1550, + }, + [61] = { + Cost = 1603, + }, + [62] = { + Cost = 1657, + }, + [63] = { + Cost = 1713, + }, + [64] = { + Cost = 1770, + }, + [65] = { + Cost = 1829, + }, + [66] = { + Cost = 1889, + }, + [67] = { + Cost = 1950, + }, + [68] = { + Cost = 2014, + }, + [69] = { + Cost = 2078, + }, + [70] = { + Cost = 2145, + }, + [71] = { + Cost = 2213, + }, + [72] = { + Cost = 2282, + }, + [73] = { + Cost = 2354, + }, + [74] = { + Cost = 2427, + }, + [75] = { + Cost = 2502, + }, + [76] = { + Cost = 2578, + }, + [77] = { + Cost = 2657, + }, + [78] = { + Cost = 2737, + }, + [79] = { + Cost = 2820, + }, + [80] = { + Cost = 2904, + }, + [81] = { + Cost = 3089, + }, + [82] = { + Cost = 3281, + }, + [83] = { + Cost = 3480, + }, + [84] = { + Cost = 3686, + }, + [85] = { + Cost = 3899, + }, + [86] = { + Cost = 4120, + }, + [87] = { + Cost = 4349, + }, + [88] = { + Cost = 4585, + }, + [89] = { + Cost = 4829, + }, + [90] = { + Cost = 5081, + }, + [91] = { + Cost = 5509, + }, + [92] = { + Cost = 5952, + }, + [93] = { + Cost = 6412, + }, + [94] = { + Cost = 6889, + }, + [95] = { + Cost = 7383, + }, + [96] = { + Cost = 7895, + }, + [97] = { + Cost = 8425, + }, + [98] = { + Cost = 8974, + }, + [99] = { + Cost = 9542, + }, + [100] = { + Cost = 10129, + }, +} diff --git a/src/Export/Scripts/goldRespecPrices.lua b/src/Export/Scripts/goldRespecPrices.lua new file mode 100644 index 0000000000..02007d7d17 --- /dev/null +++ b/src/Export/Scripts/goldRespecPrices.lua @@ -0,0 +1,19 @@ +-- +-- export skill costs data +-- + +local out = io.open("../Data/GoldRespecPrices.lua", "w") +out:write('-- This file is automatically generated, do not edit!\n') +out:write('-- Skill costs data (c) Grinding Gear Games\n\n') +out:write('return {\n') + +for c in dat("GoldRespecPrices"):Rows() do + out:write('\t[', c.Level, '] = {\n') + out:write('\t\tCost = ', c.Cost, ',\n') + out:write('\t},\n') +end + +out:write('}\n') +out:close() + +print("Gold prices data exported.") diff --git a/src/Modules/Data.lua b/src/Modules/Data.lua index e49616b8e2..95d2361e59 100644 --- a/src/Modules/Data.lua +++ b/src/Modules/Data.lua @@ -1008,3 +1008,5 @@ data.questRewards = LoadModule("Data/QuestRewards") data.flavourText = LoadModule("Data/FlavourText") data.worldAreas = {} LoadModule("Data/WorldAreas", data.worldAreas) + +data.goldRespecPrices = LoadModule("Data/GoldRespecPrices") \ No newline at end of file From a718b6139d01ba253bdc0f000aa6c7f5f9411516 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Thu, 9 Oct 2025 03:51:59 -0500 Subject: [PATCH 2/4] Move gold prices to misc exporter --- src/Classes/PassiveTreeView.lua | 2 +- src/Classes/TreeTab.lua | 2 +- src/Data/GoldRespecPrices.lua | 305 ------------------------ src/Data/Misc.lua | 103 ++++++++ src/Export/Scripts/goldRespecPrices.lua | 19 -- src/Export/Scripts/miscdata.lua | 7 + src/Modules/Data.lua | 2 - 7 files changed, 112 insertions(+), 328 deletions(-) delete mode 100644 src/Data/GoldRespecPrices.lua delete mode 100644 src/Export/Scripts/goldRespecPrices.lua diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua index 50dbd303e4..96102725ee 100644 --- a/src/Classes/PassiveTreeView.lua +++ b/src/Classes/PassiveTreeView.lua @@ -1458,7 +1458,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi end end end - local goldCost = data.goldRespecPrices[build.characterLevel].Cost + local goldCost = data.goldRespecPrices[build.characterLevel] if node.ascendancyName then goldCost = goldCost * 5 end diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua index 80183b2edc..98cc6b6a7e 100644 --- a/src/Classes/TreeTab.lua +++ b/src/Classes/TreeTab.lua @@ -82,7 +82,7 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build) end end if respec > 0 or respecAscendancy > 0 then - local goldCost = data.goldRespecPrices[build.characterLevel].Cost + local goldCost = data.goldRespecPrices[build.characterLevel] tooltip:AddLine(16, "^xFFD700"..(respec * goldCost) .. " Gold ^7required to switch to this tree.") local nodeWord = respec == 1 and "node differs" or "nodes differ" local ascendWord = respecAscendancy == 1 and "node differs" or "nodes differ" diff --git a/src/Data/GoldRespecPrices.lua b/src/Data/GoldRespecPrices.lua deleted file mode 100644 index 870baccaf4..0000000000 --- a/src/Data/GoldRespecPrices.lua +++ /dev/null @@ -1,305 +0,0 @@ --- This file is automatically generated, do not edit! --- Skill costs data (c) Grinding Gear Games - -return { - [1] = { - Cost = 15, - }, - [2] = { - Cost = 19, - }, - [3] = { - Cost = 25, - }, - [4] = { - Cost = 31, - }, - [5] = { - Cost = 39, - }, - [6] = { - Cost = 46, - }, - [7] = { - Cost = 60, - }, - [8] = { - Cost = 73, - }, - [9] = { - Cost = 85, - }, - [10] = { - Cost = 98, - }, - [11] = { - Cost = 113, - }, - [12] = { - Cost = 128, - }, - [13] = { - Cost = 145, - }, - [14] = { - Cost = 163, - }, - [15] = { - Cost = 182, - }, - [16] = { - Cost = 211, - }, - [17] = { - Cost = 225, - }, - [18] = { - Cost = 241, - }, - [19] = { - Cost = 257, - }, - [20] = { - Cost = 273, - }, - [21] = { - Cost = 290, - }, - [22] = { - Cost = 308, - }, - [23] = { - Cost = 326, - }, - [24] = { - Cost = 344, - }, - [25] = { - Cost = 364, - }, - [26] = { - Cost = 384, - }, - [27] = { - Cost = 404, - }, - [28] = { - Cost = 425, - }, - [29] = { - Cost = 447, - }, - [30] = { - Cost = 470, - }, - [31] = { - Cost = 493, - }, - [32] = { - Cost = 517, - }, - [33] = { - Cost = 542, - }, - [34] = { - Cost = 567, - }, - [35] = { - Cost = 593, - }, - [36] = { - Cost = 620, - }, - [37] = { - Cost = 648, - }, - [38] = { - Cost = 676, - }, - [39] = { - Cost = 706, - }, - [40] = { - Cost = 736, - }, - [41] = { - Cost = 767, - }, - [42] = { - Cost = 799, - }, - [43] = { - Cost = 832, - }, - [44] = { - Cost = 866, - }, - [45] = { - Cost = 900, - }, - [46] = { - Cost = 936, - }, - [47] = { - Cost = 973, - }, - [48] = { - Cost = 1010, - }, - [49] = { - Cost = 1049, - }, - [50] = { - Cost = 1089, - }, - [51] = { - Cost = 1130, - }, - [52] = { - Cost = 1172, - }, - [53] = { - Cost = 1215, - }, - [54] = { - Cost = 1259, - }, - [55] = { - Cost = 1304, - }, - [56] = { - Cost = 1351, - }, - [57] = { - Cost = 1399, - }, - [58] = { - Cost = 1448, - }, - [59] = { - Cost = 1498, - }, - [60] = { - Cost = 1550, - }, - [61] = { - Cost = 1603, - }, - [62] = { - Cost = 1657, - }, - [63] = { - Cost = 1713, - }, - [64] = { - Cost = 1770, - }, - [65] = { - Cost = 1829, - }, - [66] = { - Cost = 1889, - }, - [67] = { - Cost = 1950, - }, - [68] = { - Cost = 2014, - }, - [69] = { - Cost = 2078, - }, - [70] = { - Cost = 2145, - }, - [71] = { - Cost = 2213, - }, - [72] = { - Cost = 2282, - }, - [73] = { - Cost = 2354, - }, - [74] = { - Cost = 2427, - }, - [75] = { - Cost = 2502, - }, - [76] = { - Cost = 2578, - }, - [77] = { - Cost = 2657, - }, - [78] = { - Cost = 2737, - }, - [79] = { - Cost = 2820, - }, - [80] = { - Cost = 2904, - }, - [81] = { - Cost = 3089, - }, - [82] = { - Cost = 3281, - }, - [83] = { - Cost = 3480, - }, - [84] = { - Cost = 3686, - }, - [85] = { - Cost = 3899, - }, - [86] = { - Cost = 4120, - }, - [87] = { - Cost = 4349, - }, - [88] = { - Cost = 4585, - }, - [89] = { - Cost = 4829, - }, - [90] = { - Cost = 5081, - }, - [91] = { - Cost = 5509, - }, - [92] = { - Cost = 5952, - }, - [93] = { - Cost = 6412, - }, - [94] = { - Cost = 6889, - }, - [95] = { - Cost = 7383, - }, - [96] = { - Cost = 7895, - }, - [97] = { - Cost = 8425, - }, - [98] = { - Cost = 8974, - }, - [99] = { - Cost = 9542, - }, - [100] = { - Cost = 10129, - }, -} diff --git a/src/Data/Misc.lua b/src/Data/Misc.lua index a11304ef84..21b16426ca 100644 --- a/src/Data/Misc.lua +++ b/src/Data/Misc.lua @@ -359,3 +359,106 @@ data.hollowPalmAddedPhys = { [39] = { 302, 452 }, [40] = { 308, 462 }, } +-- From GoldRespecPrices.dat +data.goldRespecPrices = { + [1] = 15, + [2] = 19, + [3] = 25, + [4] = 31, + [5] = 39, + [6] = 46, + [7] = 60, + [8] = 73, + [9] = 85, + [10] = 98, + [11] = 113, + [12] = 128, + [13] = 145, + [14] = 163, + [15] = 182, + [16] = 211, + [17] = 225, + [18] = 241, + [19] = 257, + [20] = 273, + [21] = 290, + [22] = 308, + [23] = 326, + [24] = 344, + [25] = 364, + [26] = 384, + [27] = 404, + [28] = 425, + [29] = 447, + [30] = 470, + [31] = 493, + [32] = 517, + [33] = 542, + [34] = 567, + [35] = 593, + [36] = 620, + [37] = 648, + [38] = 676, + [39] = 706, + [40] = 736, + [41] = 767, + [42] = 799, + [43] = 832, + [44] = 866, + [45] = 900, + [46] = 936, + [47] = 973, + [48] = 1010, + [49] = 1049, + [50] = 1089, + [51] = 1130, + [52] = 1172, + [53] = 1215, + [54] = 1259, + [55] = 1304, + [56] = 1351, + [57] = 1399, + [58] = 1448, + [59] = 1498, + [60] = 1550, + [61] = 1603, + [62] = 1657, + [63] = 1713, + [64] = 1770, + [65] = 1829, + [66] = 1889, + [67] = 1950, + [68] = 2014, + [69] = 2078, + [70] = 2145, + [71] = 2213, + [72] = 2282, + [73] = 2354, + [74] = 2427, + [75] = 2502, + [76] = 2578, + [77] = 2657, + [78] = 2737, + [79] = 2820, + [80] = 2904, + [81] = 3089, + [82] = 3281, + [83] = 3480, + [84] = 3686, + [85] = 3899, + [86] = 4120, + [87] = 4349, + [88] = 4585, + [89] = 4829, + [90] = 5081, + [91] = 5509, + [92] = 5952, + [93] = 6412, + [94] = 6889, + [95] = 7383, + [96] = 7895, + [97] = 8425, + [98] = 8974, + [99] = 9542, + [100] = 10129, +} diff --git a/src/Export/Scripts/goldRespecPrices.lua b/src/Export/Scripts/goldRespecPrices.lua deleted file mode 100644 index 02007d7d17..0000000000 --- a/src/Export/Scripts/goldRespecPrices.lua +++ /dev/null @@ -1,19 +0,0 @@ --- --- export skill costs data --- - -local out = io.open("../Data/GoldRespecPrices.lua", "w") -out:write('-- This file is automatically generated, do not edit!\n') -out:write('-- Skill costs data (c) Grinding Gear Games\n\n') -out:write('return {\n') - -for c in dat("GoldRespecPrices"):Rows() do - out:write('\t[', c.Level, '] = {\n') - out:write('\t\tCost = ', c.Cost, ',\n') - out:write('\t},\n') -end - -out:write('}\n') -out:close() - -print("Gold prices data exported.") diff --git a/src/Export/Scripts/miscdata.lua b/src/Export/Scripts/miscdata.lua index b5eac0568e..89c4da7cba 100644 --- a/src/Export/Scripts/miscdata.lua +++ b/src/Export/Scripts/miscdata.lua @@ -156,6 +156,13 @@ for row in dat("FlatPhysicalDamageValues"):Rows() do end out:write('}\n') +out:write('-- From GoldRespecPrices.dat\n') +out:write('data.goldRespecPrices = {\n') +for row in dat("GoldRespecPrices"):Rows() do + out:write('\t[' .. row.Level .. '] = ' .. row.Cost .. ',\n') +end +out:write('}\n') + out:close() print("Misc data exported.") diff --git a/src/Modules/Data.lua b/src/Modules/Data.lua index 95d2361e59..e49616b8e2 100644 --- a/src/Modules/Data.lua +++ b/src/Modules/Data.lua @@ -1008,5 +1008,3 @@ data.questRewards = LoadModule("Data/QuestRewards") data.flavourText = LoadModule("Data/FlavourText") data.worldAreas = {} LoadModule("Data/WorldAreas", data.worldAreas) - -data.goldRespecPrices = LoadModule("Data/GoldRespecPrices") \ No newline at end of file From 11471d338a95ba99c8c276c1c4b95d9015b54312 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Thu, 9 Oct 2025 04:03:58 -0500 Subject: [PATCH 3/4] fix tooltip text on tree compare --- src/Classes/TreeTab.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua index 98cc6b6a7e..cbeabcb5d7 100644 --- a/src/Classes/TreeTab.lua +++ b/src/Classes/TreeTab.lua @@ -83,11 +83,16 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build) end if respec > 0 or respecAscendancy > 0 then local goldCost = data.goldRespecPrices[build.characterLevel] - tooltip:AddLine(16, "^xFFD700"..(respec * goldCost) .. " Gold ^7required to switch to this tree.") - local nodeWord = respec == 1 and "node differs" or "nodes differ" - local ascendWord = respecAscendancy == 1 and "node differs" or "nodes differ" - tooltip:AddLine(16, string.format("^7\t%d Passive %s from your current tree.", respec, nodeWord)) - tooltip:AddLine(16, string.format("^7\t%d Ascendancy %s from your current tree.", respecAscendancy, ascendWord)) + local totalGold = (respec * goldCost) + (respecAscendancy * goldCost * 5) + tooltip:AddLine(16, string.format("^xFFD700%d Gold ^7required to switch to this tree.", totalGold)) + if respec > 0 then + local nodeWord = respec == 1 and "Passive node to be refunded" or "Passive nodes to be refunded" + tooltip:AddLine(16, string.format("^7\t%d %s.", respec, nodeWord)) + end + if respecAscendancy > 0 then + local ascendWord = respecAscendancy == 1 and "Ascendancy node to be refunded" or "Ascendancy nodes to be refunded" + tooltip:AddLine(16, string.format("^7\t%d %s.", respecAscendancy, ascendWord)) + end end end end From fcd94e72ca5f3fae0d1f9630fef11e455e0a80cd Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Thu, 9 Oct 2025 04:34:13 -0500 Subject: [PATCH 4/4] Show commas for large gold values --- src/Classes/PassiveTreeView.lua | 4 +- src/Classes/TreeTab.lua | 7 ++- src/Data/Misc.lua | 103 +------------------------------- src/Export/Scripts/miscdata.lua | 4 +- 4 files changed, 9 insertions(+), 109 deletions(-) diff --git a/src/Classes/PassiveTreeView.lua b/src/Classes/PassiveTreeView.lua index ea5ffb745a..c3bf54082b 100644 --- a/src/Classes/PassiveTreeView.lua +++ b/src/Classes/PassiveTreeView.lua @@ -1469,10 +1469,10 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi if node.depends and #node.depends > 1 then tooltip:AddSeparator(14) tooltip:AddLine(14, "^7"..#node.depends .. " points gained from unallocating these nodes") - tooltip:AddLine(14, "^xFFD700"..(#node.depends * goldCost) .. " Gold ^7required to unallocate these nodes") + tooltip:AddLine(14, "^xFFD700"..formatNumSep(#node.depends * goldCost) .. " Gold ^7required to unallocate these nodes") tooltip:AddLine(14, colorCodes.TIP) elseif node.alloc then - tooltip:AddLine(14, "^xFFD700"..(#node.depends * goldCost) .. " Gold ^7required to unallocate this node") + tooltip:AddLine(14, "^xFFD700"..formatNumSep(#node.depends * goldCost) .. " Gold ^7required to unallocate this node") tooltip:AddLine(14, colorCodes.TIP) end diff --git a/src/Classes/TreeTab.lua b/src/Classes/TreeTab.lua index cbeabcb5d7..13781def55 100644 --- a/src/Classes/TreeTab.lua +++ b/src/Classes/TreeTab.lua @@ -84,14 +84,15 @@ local TreeTabClass = newClass("TreeTab", "ControlHost", function(self, build) if respec > 0 or respecAscendancy > 0 then local goldCost = data.goldRespecPrices[build.characterLevel] local totalGold = (respec * goldCost) + (respecAscendancy * goldCost * 5) - tooltip:AddLine(16, string.format("^xFFD700%d Gold ^7required to switch to this tree.", totalGold)) + local goldStr = formatNumSep(tostring(totalGold)) + tooltip:AddLine(16, "^xFFD700" .. goldStr .. " Gold ^7required to switch to this tree.") if respec > 0 then local nodeWord = respec == 1 and "Passive node to be refunded" or "Passive nodes to be refunded" - tooltip:AddLine(16, string.format("^7\t%d %s.", respec, nodeWord)) + tooltip:AddLine(16, s_format("^7\t%d %s.", respec, nodeWord)) end if respecAscendancy > 0 then local ascendWord = respecAscendancy == 1 and "Ascendancy node to be refunded" or "Ascendancy nodes to be refunded" - tooltip:AddLine(16, string.format("^7\t%d %s.", respecAscendancy, ascendWord)) + tooltip:AddLine(16, s_format("^7\t%d %s.", respecAscendancy, ascendWord)) end end end diff --git a/src/Data/Misc.lua b/src/Data/Misc.lua index cd647f6665..28bb4d4054 100644 --- a/src/Data/Misc.lua +++ b/src/Data/Misc.lua @@ -359,105 +359,4 @@ data.hollowPalmAddedPhys = { [40] = { 308, 462 }, } -- From GoldRespecPrices.dat -data.goldRespecPrices = { - [1] = 15, - [2] = 19, - [3] = 25, - [4] = 31, - [5] = 39, - [6] = 46, - [7] = 60, - [8] = 73, - [9] = 85, - [10] = 98, - [11] = 113, - [12] = 128, - [13] = 145, - [14] = 163, - [15] = 182, - [16] = 211, - [17] = 225, - [18] = 241, - [19] = 257, - [20] = 273, - [21] = 290, - [22] = 308, - [23] = 326, - [24] = 344, - [25] = 364, - [26] = 384, - [27] = 404, - [28] = 425, - [29] = 447, - [30] = 470, - [31] = 493, - [32] = 517, - [33] = 542, - [34] = 567, - [35] = 593, - [36] = 620, - [37] = 648, - [38] = 676, - [39] = 706, - [40] = 736, - [41] = 767, - [42] = 799, - [43] = 832, - [44] = 866, - [45] = 900, - [46] = 936, - [47] = 973, - [48] = 1010, - [49] = 1049, - [50] = 1089, - [51] = 1130, - [52] = 1172, - [53] = 1215, - [54] = 1259, - [55] = 1304, - [56] = 1351, - [57] = 1399, - [58] = 1448, - [59] = 1498, - [60] = 1550, - [61] = 1603, - [62] = 1657, - [63] = 1713, - [64] = 1770, - [65] = 1829, - [66] = 1889, - [67] = 1950, - [68] = 2014, - [69] = 2078, - [70] = 2145, - [71] = 2213, - [72] = 2282, - [73] = 2354, - [74] = 2427, - [75] = 2502, - [76] = 2578, - [77] = 2657, - [78] = 2737, - [79] = 2820, - [80] = 2904, - [81] = 3089, - [82] = 3281, - [83] = 3480, - [84] = 3686, - [85] = 3899, - [86] = 4120, - [87] = 4349, - [88] = 4585, - [89] = 4829, - [90] = 5081, - [91] = 5509, - [92] = 5952, - [93] = 6412, - [94] = 6889, - [95] = 7383, - [96] = 7895, - [97] = 8425, - [98] = 8974, - [99] = 9542, - [100] = 10129, -} +data.goldRespecPrices = { 15, 19, 25, 31, 39, 46, 60, 73, 85, 98, 113, 128, 145, 163, 182, 211, 225, 241, 257, 273, 290, 308, 326, 344, 364, 384, 404, 425, 447, 470, 493, 517, 542, 567, 593, 620, 648, 676, 706, 736, 767, 799, 832, 866, 900, 936, 973, 1010, 1049, 1089, 1130, 1172, 1215, 1259, 1304, 1351, 1399, 1448, 1498, 1550, 1603, 1657, 1713, 1770, 1829, 1889, 1950, 2014, 2078, 2145, 2213, 2282, 2354, 2427, 2502, 2578, 2657, 2737, 2820, 2904, 3089, 3281, 3480, 3686, 3899, 4120, 4349, 4585, 4829, 5081, 5509, 5952, 6412, 6889, 7383, 7895, 8425, 8974, 9542, 10129, } diff --git a/src/Export/Scripts/miscdata.lua b/src/Export/Scripts/miscdata.lua index 89c4da7cba..a8be2c8632 100644 --- a/src/Export/Scripts/miscdata.lua +++ b/src/Export/Scripts/miscdata.lua @@ -157,9 +157,9 @@ end out:write('}\n') out:write('-- From GoldRespecPrices.dat\n') -out:write('data.goldRespecPrices = {\n') +out:write('data.goldRespecPrices = { ') for row in dat("GoldRespecPrices"):Rows() do - out:write('\t[' .. row.Level .. '] = ' .. row.Cost .. ',\n') + out:write(row.Cost .. ', ') end out:write('}\n')