Ludovicus-Maior · Hendo72 · Mar 16, 2024 · Mar 18, 2024 · Mar 18, 2024 · Mar 18, 2024
diff --git a/WoWPro/Libraries/HereBeDragons/CHANGELOG.md b/WoWPro/Libraries/HereBeDragons/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Lib: HereBeDragons
 
-## [2.13-release-3-g6a0a022](https://github.com/Nevcairiel/HereBeDragons/tree/6a0a022e97aab278e0f41e150ffc9d59313dde90) (2024-04-20)
-[Full Changelog](https://github.com/Nevcairiel/HereBeDragons/compare/2.13-release...6a0a022e97aab278e0f41e150ffc9d59313dde90) [Previous Releases](https://github.com/Nevcairiel/HereBeDragons/releases)
+## [2.13-release](https://github.com/Nevcairiel/HereBeDragons/tree/2.13-release) (2023-07-12)
+[Full Changelog](https://github.com/Nevcairiel/HereBeDragons/compare/2.12-release...2.13-release) [Previous Releases](https://github.com/Nevcairiel/HereBeDragons/releases)
 
-- Update Library version, forgotten in previous commit  
-    Also force a data update for Cataclysm  
-- Update for Cataclysm Classic  
-- Update TOC for 10.2.6  
+- Update TOC for 10.1.5  
+- HBD-Pins-2.0: Hack around combat limitations in 10.1.5  
+    SetPassThroughButtons can no longer be called in combat, but we allow  
+    creating pins at any time during play. Until such a point when this is  
+    fixed by Blizzard, noop out the function so that creating pins no longer  
+    errors.  
+    This function is called on the pin by Blizzards pin handler, which is of  
+    course insecure on addon-created pins.  
+- Update TOC for 10.1  
+- Update TOC for 10.0.7  
diff --git a/WoWPro/Libraries/HereBeDragons/HereBeDragons-2.0.lua b/WoWPro/Libraries/HereBeDragons/HereBeDragons-2.0.lua
@@ -1,6 +1,6 @@
 -- HereBeDragons is a data API for the World of Warcraft mapping system
 
-local MAJOR, MINOR = "HereBeDragons-2.0", 23
+local MAJOR, MINOR = "HereBeDragons-2.0", 22
 assert(LibStub, MAJOR .. " requires LibStub")
 
 local HereBeDragons, oldversion = LibStub:NewLibrary(MAJOR, MINOR)
@@ -15,10 +15,10 @@ HereBeDragons.worldMapData     = HereBeDragons.worldMapData or {}
 HereBeDragons.transforms       = HereBeDragons.transforms or {}
 HereBeDragons.callbacks        = HereBeDragons.callbacks or CBH:New(HereBeDragons, nil, nil, false)
 
+local WOW_INTERFACE_VER = select(4, GetBuildInfo())
 local WoWClassic = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC)
-local WoWBC = (WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC)
-local WoWWrath = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC)
-local WoWCata = (WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC)
+local WoWBC = (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE) and WOW_INTERFACE_VER >= 20500 and WOW_INTERFACE_VER < 30000
+local WoWWrath = (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE) and WOW_INTERFACE_VER >= 30400 and WOW_INTERFACE_VER < 40000
 
 -- Data Constants
 local COSMIC_MAP_ID = 946
@@ -83,7 +83,7 @@ local function overrideInstance(instance) return instanceIDOverrides[instance] o
 HereBeDragons.___DIIDO = dynamicInstanceIDOverrides
 
 -- gather map info, but only if this isn't an upgrade (or the upgrade version forces a re-map)
-if not oldversion or oldversion < 23 then
+if not oldversion or oldversion < 21 then
     -- wipe old data, if required, otherwise the upgrade path isn't triggered
     if oldversion then
         wipe(mapData)
@@ -107,11 +107,6 @@ if not oldversion or oldversion < 23 then
             { 530, 1, -6933.33, 533.33, -16000, -8000, 10339.7, 17600 },
             { 609, 0, -10000, 10000, -10000, 10000, 0, 0 },
         }
-    elseif WoWCata then
-        transformData = {
-            { 530, 0, 4800, 16000, -10133.3, -2666.67, -2400, 2662.8 },
-            { 530, 1, -6933.33, 533.33, -16000, -8000, 10339.7, 17600 },
-        }
     else
         transformData = {
             { 530, 1, -6933.33, 533.33, -16000, -8000, 9916, 17600 },
@@ -230,10 +225,6 @@ if not oldversion or oldversion < 23 then
             worldMapData[0] = { 48033.24, 32020.8, 36867.97, 14848.84 }
             worldMapData[1] = { 47908.72, 31935.28, 8552.61, 18467.83 }
             worldMapData[571] = { 47662.7, 31772.19, 25198.53, 11072.07 }
-        elseif WoWCata then
-            worldMapData[0] = { 48033.24, 32020.8, 36867.97, 14848.84 }
-            worldMapData[1] = { 47908.72, 31935.28, 8552.61, 18467.83 }
-            worldMapData[571] = { 47662.7, 31772.19, 25198.53, 11072.07 }
         else
             worldMapData[0] = { 76153.14, 50748.62, 65008.24, 23827.51 }
             worldMapData[1] = { 77621.13, 51854.98, 18576.47, 28030.61 }

diff --git a/WoWPro/WoWPro.lua b/WoWPro/WoWPro.lua
@@ -325,16 +325,16 @@ local defaults = { profile = {
     stickytexture = [[Interface\Tooltips\UI-Tooltip-Background]],
     stickycolor = {0.8, 0.8, 0.8, 0.7},
     stepfont = [[Fonts\FRIZQT__.TTF]],
-    steptextsize = 13,
+    steptextsize = 12,
     steptextcolor = {1, 1, 1},
     notefont = [[Fonts\FRIZQT__.TTF]],
-    notetextsize = 11,
+    notetextsize = 10,
     notetextcolor = {1, 1, 0},
     trackfont = [[Fonts\FRIZQT__.TTF]],
     tracktextsize = 10,
     tracktextcolor = {1, 1, 0},
     titlefont = [[Fonts\FRIZQT__.TTF]],
-    titletextsize = 15,
+    titletextsize = 10,
     titletextcolor = {1, 1, 1},
     stickytitlefont = [[Fonts\FRIZQT__.TTF]],
     stickytitletextsize = 13,

diff --git a/WoWPro/WoWPro_CurrentGuide.lua b/WoWPro/WoWPro_CurrentGuide.lua
@@ -13,13 +13,15 @@ WoWPro.CreateCurrentGuideTitle = true
 local frame = _G.CreateFrame("Frame", "CreateGuide", _G.UIParent, "BackdropTemplate")
 frame.name = L["Current Guide"]
 frame.parent = "WoWPro"
-frame.parent = "WoWPro"
 if WoWPro.CLASSIC then
-    frame:SetSize(600, 500)
+    frame:SetSize(600, 700)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
 elseif WoWPro.WRATH then
     frame:SetSize(650, 520)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
+elseif WoWPro.CATA then
+    frame:SetSize(700, 550)
+    frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
 else
     frame:SetSize(625, 480)
     frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
@@ -30,7 +32,6 @@ texture:SetAllPoints(true)
 texture:SetColorTexture(0, 0, 0, 0)
 frame:SetBackdropColor(0, 0, 0, 0)
 
-
 -- Add the frame to the special frames list
 _G.table.insert(_G.UISpecialFrames, frame:GetName())
 
@@ -45,22 +46,25 @@ do
     elseif WoWPro.WRATH then
         title:SetPoint("TOPLEFT", 16, -60)
         title:SetPoint("RIGHT", frame, -16, -10)
+    elseif WoWPro.CATA then
+        title:SetPoint("TOPLEFT", 16, -65)
+        title:SetPoint("RIGHT", frame, -16, -20)
     else
-        title:SetPoint("TOPLEFT", 16, 0)
+        title:SetPoint("TOPLEFT", 16, -60)
         title:SetPoint("RIGHT", frame, -18, -5)
     end
     title:SetText("WoWPro - "..L["Current Guide"])
     title:SetJustifyH("CENTER")
     frame.title = title
 
-local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
-subtitle:SetHeight(32)
-subtitle:SetPoint("TOPLEFT", title, "BOTTOMLEFT", 0, -8)
-subtitle:SetPoint("RIGHT", frame, -32, 0)
-subtitle:SetNonSpaceWrap(true)
-subtitle:SetJustifyH("CENTER")
-subtitle:SetJustifyV("TOP")
-frame.subtitle = subtitle
+    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
+    subtitle:SetHeight(32)
+    subtitle:SetPoint("TOPLEFT", title, "BOTTOMLEFT", 0, -8)
+    subtitle:SetPoint("RIGHT", frame, -32, 0)
+    subtitle:SetNonSpaceWrap(true)
+    subtitle:SetJustifyH("CENTER")
+    subtitle:SetJustifyV("TOP")
+    frame.subtitle = subtitle
 
     local box = WoWPro:CreateBG(frame)
     box:SetPoint("TOP", subtitle, "BOTTOM", 0, -GAP)

diff --git a/WoWPro/WoWPro_Frames.lua b/WoWPro/WoWPro_Frames.lua
@@ -616,7 +616,7 @@ function WoWPro:CreateStickyFrame()
     stickytitle:SetPoint("TOPRIGHT", -5, 4)
     stickytitle:SetHeight(25)
     stickytitle:SetJustifyH("LEFT")
-    stickytitle:SetJustifyV("CENTER")
+    stickytitle:SetJustifyV("MIDDLE")
     stickytitle:SetText(L["As you go:"])
     WoWPro.StickyTitle = stickytitle
 end

diff --git a/WoWPro/WoWPro_GuideList.lua b/WoWPro/WoWPro_GuideList.lua
@@ -82,7 +82,7 @@ function GuideListMixin:SelectTab(tabIndex)
                     text = button:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
                     text:SetPoint("TOP")
                     text:SetPoint("BOTTOM")
-                    text:SetPoint("LEFT", self.headers[index], 6, 0)
+                    text:SetPoint("LEFT", self.headers[index], 6, 0) -- Controls position of list
                     text:SetPoint("RIGHT", self.headers[index], -6, 0)
 
                     button[index] = text
@@ -111,6 +111,9 @@ function WoWPro.CreateGuideList()
     elseif WoWPro.WRATH then
         frame:SetSize(650, 520)
         frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
+    elseif WoWPro.CATA then
+        frame:SetSize(650, 550)
+        frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
     else
         frame:SetSize(625, 600)
         frame:SetPoint("CENTER", _G.UIParent, "CENTER", 105, 10)
@@ -133,16 +136,20 @@ function WoWPro.CreateGuideList()
         title:SetPoint("TOP", frame, "TOP", 0, -30)
     elseif WoWPro.WRATH then
         title:SetPoint("TOP", frame, "TOP", 0, -10)
+    elseif WoWPro.CATA then
+        title:SetPoint("TOP", frame, "TOP", 0, 0) -- Set the point for Cataclysm
     else
         title:SetPoint("TOP", frame, "TOP", 0, 50)
     end
     frame.title = title
-    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
+    local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") -- White text
     subtitle:SetHeight(40)
     if WoWPro.CLASSIC then
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -30)
     elseif WoWPro.WRATH then
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -45)
+    elseif WoWPro.CATA then
+        subtitle:SetPoint("TOP", title, "BOTTOM", 0, -60)
     else
         subtitle:SetPoint("TOP", title, "BOTTOM", 0, -60)
     end
@@ -169,6 +176,8 @@ function WoWPro.CreateGuideList()
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, -1)
                 elseif WoWPro.WRATH then
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, 1)
+                elseif WoWPro.CATA then
+                    tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 13, 2)
                 else
                     tab:SetPoint("BOTTOMLEFT", scrollBox.titleRow, "TOPLEFT", 80, 20)
                 end