Several bugfixes and improvements, mainly related to leveling builds and improved Midnight support

Numynum · Numynum · commit 3283d5fbb618 · 2025-12-06T16:58:59.000+01:00
diff --git a/TalentTreeViewer_Loader/libs/load_libs.xml b/TalentTreeViewer_Loader/libs/load_libs.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
+https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
 	<Script file="LibStub\LibStub.lua"/>
 	<Include file="CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
 	<Include file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
diff --git a/TalentTreeViewer_Loader/locale/locale.xml b/TalentTreeViewer_Loader/locale/locale.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
+https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
     <Script file="enUS.lua"/>
     <Script file="deDE.lua"/>
     <Script file="frFR.lua"/>
diff --git a/TalentTreeViewer_TWW/IcyVeinsImport.lua b/TalentTreeViewer_TWW/IcyVeinsImport.lua
@@ -1,4 +1,6 @@
-local name, ns = ...
+local name = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 --- @class TalentViewerIcyVeinsImportTWW
 local IcyVeinsImport = ns.IcyVeinsImport
diff --git a/TalentTreeViewer_TWW/ImportExport.lua b/TalentTreeViewer_TWW/ImportExport.lua
@@ -1,4 +1,6 @@
-local name, ns = ...
+local name = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 --- @class TalentViewerImportExportTWW
 local ImportExport = ns.ImportExport
diff --git a/TalentTreeViewer_TWW/TalentViewer.lua b/TalentTreeViewer_TWW/TalentViewer.lua
diff --git a/TalentTreeViewer_TWW/TalentViewerUI.xml b/TalentTreeViewer_TWW/TalentViewerUI.xml
@@ -1,7 +1,5 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.blizzard.com/wow/ui/ https://raw.githubusercontent.com/Gethe/wow-ui-source/live/Interface/FrameXML/UI_shared.xsd"
->
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
     <!-- copied and adapted from blizzard's code -->
 
     <Frame name="TalentViewer_ClassTalentsFrameTemplate" mixin="TalentViewer_ClassTalentsFrameMixin" inherits="TalentFrameBaseTemplate" virtual="true">
@@ -189,6 +187,12 @@
                 </Anchors>
             </Frame>
 
+            <Frame parentKey="HeroSpecCurrencyDisplay" inherits="ClassTalentCurrencyDisplayTemplate">
+                <Anchors>
+					<Anchor point="LEFT" relativeKey="$parent" relativePoint="TOPRIGHT" x="-971" y="-48"/>
+                </Anchors>
+            </Frame>
+
             <Frame parentKey="SpecCurrencyDisplay" inherits="ClassTalentCurrencyDisplayTemplate">
                 <Anchors>
 					<Anchor point="CENTER" relativeKey="$parent" relativePoint="TOPRIGHT" x="-401" y="-48"/>
diff --git a/TalentTreeViewer_TWW/levelingBuildFormat.md b/TalentTreeViewer_TWW/levelingBuildFormat.md
@@ -21,7 +21,7 @@ The export string is built as follows:
 - The body still is a list of 7-bit integers, but the values now describe the level at which a given talent was learned
 
 ### Leveling Build Format
-The leveling build string is a base64-encoded string, made of a sequence of of variable bit length integers.
+The leveling build string is a base64-encoded string, made of a sequence of integers with various bit lengths.
 The base64-encoding is done using Blizzard's modified base64 encoding. One can use their `ExportUtil` helper to read/write the string.
 
 ### Header
@@ -60,7 +60,7 @@ This results in a body with the following values (`_` is added for readability)
 `0b000_0000 0b000_1101 0b000_0000 0b000_1011` (base10 `0 13 0 11`)
 
 ```lua
--- Given the above example, is parsed into tables as follows:
+-- Given the above example is parsed into tables as follows:
 local talentsLearnedInTalentBuild = {"A", "B", "C", "D"};
 local data = {0, 13, 0, 11};
 -- The function below returns the talent learned at a specific level.
diff --git a/TalentTreeViewer_TWW/locale/locale.xml b/TalentTreeViewer_TWW/locale/locale.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-https://raw.githubusercontent.com/Meorawr/wow-ui-schema/main/UI.xsd">
+https://raw.githubusercontent.com/Gethe/wow-ui-source/refs/heads/live/Interface/AddOns/Blizzard_SharedXML/UI.xsd">
     <Script file="enUS.lua"/>
     <Script file="deDE.lua"/>
     <Script file="frFR.lua"/>
diff --git a/TalentTreeViewer_TWW/mixins/HeroSpecSelectionDialogMixin.lua b/TalentTreeViewer_TWW/mixins/HeroSpecSelectionDialogMixin.lua
@@ -1,8 +1,10 @@
-local _, ns = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 ns.mixins = ns.mixins or {};
 
 --- default UI uses this mixin to handle the dialog for selecting a hero spec, but we don't like that popup, and just show it in the main UI instead
+--- @class TalentViewer_HeroSpecSelectionDialog: Frame
 TalentViewer_HeroSpecSelectionDialogMixin = {};
 local dialogMixin = TalentViewer_HeroSpecSelectionDialogMixin;
 
diff --git a/TalentTreeViewer_TWW/mixins/LevelingOrderMixin.lua b/TalentTreeViewer_TWW/mixins/LevelingOrderMixin.lua
@@ -1,4 +1,5 @@
-local _, ns = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 ns.mixins = ns.mixins or {};
 
diff --git a/TalentTreeViewer_TWW/mixins/LevelingSliderMixin.lua b/TalentTreeViewer_TWW/mixins/LevelingSliderMixin.lua
@@ -1,14 +1,15 @@
-local _, ns = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 ns.mixins = ns.mixins or {};
 
 --- @type TalentViewerTWW
 local TalentViewer = ns.TalentViewer;
 if not TalentViewer then return; end
 
---- @class TalentViewer_LevelingSliderMixinTWW
+--- @class TalentViewer_LevelingSlider: Slider, MinimalSliderWithSteppersTemplate
 TalentViewer_LevelingSliderMixin = CreateFromMixins(MinimalSliderWithSteppersMixin);
---- @class TalentViewer_LevelingSliderMixinTWW
+--- @class TalentViewer_LevelingSlider
 local LevelingSliderMixin = TalentViewer_LevelingSliderMixin;
 LevelingSliderMixin:GenerateCallbackEvents(
     {
diff --git a/TalentTreeViewer_TWW/mixins/TalentButtonMixin.lua b/TalentTreeViewer_TWW/mixins/TalentButtonMixin.lua
@@ -1,4 +1,5 @@
-local _, ns = ...;
+--- @class TTV_TWW_NS
+local ns = select(2, ...);
 
 ns.mixins = ns.mixins or {};
 
@@ -25,14 +26,14 @@ function TalentButtonMixin:OnClick(button)
 end
 
 function TalentButtonMixin:PurchaseRank()
-    --- @type TalentViewerUIMixinTWW
+    --- @type TalentViewer_ClassTalentsFrameTemplate
     local talentFrame = self.talentFrame;
     self:PlaySelectSound();
     talentFrame:PurchaseRank(self:GetNodeID());
 end
 
 function TalentButtonMixin:RefundRank()
-    --- @type TalentViewerUIMixinTWW
+    --- @type TalentViewer_ClassTalentsFrameTemplate
     local talentFrame = self.talentFrame;
     self:PlayDeselectSound();
     talentFrame:RefundRank(self:GetNodeID());
diff --git a/TalentTreeViewer_TWW/mixins/TalentViewerUIMixin.lua b/TalentTreeViewer_TWW/mixins/TalentViewerUIMixin.lua
diff --git a/types.lua b/types.lua
