From d8e7242836790f3e02d0802081baa48f9cc21ba4 Mon Sep 17 00:00:00 2001 From: Arxareon Date: Mon, 24 Jul 2023 10:34:19 +0200 Subject: [PATCH] Hotfix 2.3.1 Addon data recovery will now work properly when loading old data. --- RemainingXP/Main.lua | 44 ++++++++++++++-------------- RemainingXP/Main_Classic.lua | 44 ++++++++++++++-------------- RemainingXP/Main_WotLK.lua | 44 ++++++++++++++-------------- RemainingXP/RemainingXP-BCC.toc | 4 +-- RemainingXP/RemainingXP-Classic.toc | 4 +-- RemainingXP/RemainingXP-Mainline.toc | 4 +-- RemainingXP/RemainingXP-Wrath.toc | 4 +-- RemainingXP/RemainingXP.toc | 4 +-- RemainingXP/Resources.lua | 2 ++ 9 files changed, 78 insertions(+), 76 deletions(-) diff --git a/RemainingXP/Main.lua b/RemainingXP/Main.lua index 1d69e8d..1c3526b 100644 --- a/RemainingXP/Main.lua +++ b/RemainingXP/Main.lua @@ -26,7 +26,7 @@ local dbDefault = { display = { position = { anchor = "TOP", - offset = { x = 0, y = -58, }, + offset = { x = 0, y = -58 } }, layer = { strata = "HIGH", @@ -345,29 +345,29 @@ local function CheckDBs(dbCheck, dbSample, dbcCheck, dbcSample) wt.AddMissing(dbCheck, dbSample) wt.AddMissing(dbcCheck, dbcSample) wt.RemoveMismatch(dbCheck, dbSample, { - ["customPreset.position.point"] = { saveTo = dbSample.customPreset.position, saveKey = "anchor" }, - ["position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["display.position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["appearance.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.fade"] = { saveTo = dbSample.display, saveKey = "fade" }, - ["appearance.backdrop.visible"] = { saveTo = dbSample.display.background, saveKey = "visible" }, - ["appearance.backdrop.color.r"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "r" }, - ["appearance.backdrop.color.g"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "g" }, - ["appearance.backdrop.color.b"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "b" }, - ["appearance.backdrop.color.a"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "a" }, - ["font.family"] = { saveTo = dbSample.display.text.font, saveKey = "family" }, - ["font.size"] = { saveTo = dbSample.display.text.font, saveKey = "size" }, - ["font.color.r"] = { saveTo = dbSample.display.text.font.color, saveKey = "r" }, - ["font.color.g"] = { saveTo = dbSample.display.text.font.color, saveKey = "g" }, - ["font.color.b"] = { saveTo = dbSample.display.text.font.color, saveKey = "b" }, - ["font.color.a"] = { saveTo = dbSample.display.text.font.color, saveKey = "a" }, - ["removals.statusBars"] = { saveTo = dbSample.removals, saveKey = "xpBar" }, - ["notifications.maxReminder"] = { saveTo = dbSample.notifications.statusNotice, saveKey = "maxReminder" }, - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["customPreset.position.point"] = { saveTo = dbCheck.customPreset.position, saveKey = "anchor" }, + ["position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["display.position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["appearance.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.fade"] = { saveTo = dbCheck.display, saveKey = "fade" }, + ["appearance.backdrop.visible"] = { saveTo = dbCheck.display.background, saveKey = "visible" }, + ["appearance.backdrop.color.r"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "r" }, + ["appearance.backdrop.color.g"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "g" }, + ["appearance.backdrop.color.b"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "b" }, + ["appearance.backdrop.color.a"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "a" }, + ["font.family"] = { saveTo = dbCheck.display.text.font, saveKey = "family" }, + ["font.size"] = { saveTo = dbCheck.display.text.font, saveKey = "size" }, + ["font.color.r"] = { saveTo = dbCheck.display.text.font.color, saveKey = "r" }, + ["font.color.g"] = { saveTo = dbCheck.display.text.font.color, saveKey = "g" }, + ["font.color.b"] = { saveTo = dbCheck.display.text.font.color, saveKey = "b" }, + ["font.color.a"] = { saveTo = dbCheck.display.text.font.color, saveKey = "a" }, + ["removals.statusBars"] = { saveTo = dbCheck.removals, saveKey = "xpBar" }, + ["notifications.maxReminder"] = { saveTo = dbCheck.notifications.statusNotice, saveKey = "maxReminder" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) wt.RemoveMismatch(dbcCheck, dbcSample, { - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) --Check the display visibility values diff --git a/RemainingXP/Main_Classic.lua b/RemainingXP/Main_Classic.lua index db1345a..aec8460 100644 --- a/RemainingXP/Main_Classic.lua +++ b/RemainingXP/Main_Classic.lua @@ -26,7 +26,7 @@ local dbDefault = { display = { position = { anchor = "TOP", - offset = { x = 0, y = -120, }, + offset = { x = 0, y = -120 } }, layer = { strata = "HIGH", @@ -323,29 +323,29 @@ local function CheckDBs(dbCheck, dbSample, dbcCheck, dbcSample) wt.AddMissing(dbCheck, dbSample) wt.AddMissing(dbcCheck, dbcSample) wt.RemoveMismatch(dbCheck, dbSample, { - ["customPreset.position.point"] = { saveTo = dbSample.customPreset.position, saveKey = "anchor" }, - ["position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["display.position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["appearance.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.fade"] = { saveTo = dbSample.display, saveKey = "fade" }, - ["appearance.backdrop.visible"] = { saveTo = dbSample.display.background, saveKey = "visible" }, - ["appearance.backdrop.color.r"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "r" }, - ["appearance.backdrop.color.g"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "g" }, - ["appearance.backdrop.color.b"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "b" }, - ["appearance.backdrop.color.a"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "a" }, - ["font.family"] = { saveTo = dbSample.display.text.font, saveKey = "family" }, - ["font.size"] = { saveTo = dbSample.display.text.font, saveKey = "size" }, - ["font.color.r"] = { saveTo = dbSample.display.text.font.color, saveKey = "r" }, - ["font.color.g"] = { saveTo = dbSample.display.text.font.color, saveKey = "g" }, - ["font.color.b"] = { saveTo = dbSample.display.text.font.color, saveKey = "b" }, - ["font.color.a"] = { saveTo = dbSample.display.text.font.color, saveKey = "a" }, - ["removals.statusBars"] = { saveTo = dbSample.removals, saveKey = "xpBar" }, - ["notifications.maxReminder"] = { saveTo = dbSample.notifications.statusNotice, saveKey = "maxReminder" }, - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["customPreset.position.point"] = { saveTo = dbCheck.customPreset.position, saveKey = "anchor" }, + ["position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["display.position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["appearance.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.fade"] = { saveTo = dbCheck.display, saveKey = "fade" }, + ["appearance.backdrop.visible"] = { saveTo = dbCheck.display.background, saveKey = "visible" }, + ["appearance.backdrop.color.r"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "r" }, + ["appearance.backdrop.color.g"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "g" }, + ["appearance.backdrop.color.b"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "b" }, + ["appearance.backdrop.color.a"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "a" }, + ["font.family"] = { saveTo = dbCheck.display.text.font, saveKey = "family" }, + ["font.size"] = { saveTo = dbCheck.display.text.font, saveKey = "size" }, + ["font.color.r"] = { saveTo = dbCheck.display.text.font.color, saveKey = "r" }, + ["font.color.g"] = { saveTo = dbCheck.display.text.font.color, saveKey = "g" }, + ["font.color.b"] = { saveTo = dbCheck.display.text.font.color, saveKey = "b" }, + ["font.color.a"] = { saveTo = dbCheck.display.text.font.color, saveKey = "a" }, + ["removals.statusBars"] = { saveTo = dbCheck.removals, saveKey = "xpBar" }, + ["notifications.maxReminder"] = { saveTo = dbCheck.notifications.statusNotice, saveKey = "maxReminder" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) wt.RemoveMismatch(dbcCheck, dbcSample, { - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) --Check the display visibility values diff --git a/RemainingXP/Main_WotLK.lua b/RemainingXP/Main_WotLK.lua index 3f9c284..a245179 100644 --- a/RemainingXP/Main_WotLK.lua +++ b/RemainingXP/Main_WotLK.lua @@ -26,7 +26,7 @@ local dbDefault = { display = { position = { anchor = "TOP", - offset = { x = 0, y = -120, }, + offset = { x = 0, y = -120 } }, layer = { strata = "HIGH", @@ -341,29 +341,29 @@ local function CheckDBs(dbCheck, dbSample, dbcCheck, dbcSample) wt.AddMissing(dbCheck, dbSample) wt.AddMissing(dbcCheck, dbcSample) wt.RemoveMismatch(dbCheck, dbSample, { - ["customPreset.position.point"] = { saveTo = dbSample.customPreset.position, saveKey = "anchor" }, - ["position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["display.position.point"] = { saveTo = dbSample.display.position, saveKey = "anchor" }, - ["appearance.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.frameStrata"] = { saveTo = dbSample.display.layer, saveKey = "strata" }, - ["display.visibility.fade"] = { saveTo = dbSample.display, saveKey = "fade" }, - ["appearance.backdrop.visible"] = { saveTo = dbSample.display.background, saveKey = "visible" }, - ["appearance.backdrop.color.r"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "r" }, - ["appearance.backdrop.color.g"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "g" }, - ["appearance.backdrop.color.b"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "b" }, - ["appearance.backdrop.color.a"] = { saveTo = dbSample.display.background.colors.bg, saveKey = "a" }, - ["font.family"] = { saveTo = dbSample.display.text.font, saveKey = "family" }, - ["font.size"] = { saveTo = dbSample.display.text.font, saveKey = "size" }, - ["font.color.r"] = { saveTo = dbSample.display.text.font.color, saveKey = "r" }, - ["font.color.g"] = { saveTo = dbSample.display.text.font.color, saveKey = "g" }, - ["font.color.b"] = { saveTo = dbSample.display.text.font.color, saveKey = "b" }, - ["font.color.a"] = { saveTo = dbSample.display.text.font.color, saveKey = "a" }, - ["removals.statusBars"] = { saveTo = dbSample.removals, saveKey = "xpBar" }, - ["notifications.maxReminder"] = { saveTo = dbSample.notifications.statusNotice, saveKey = "maxReminder" }, - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["customPreset.position.point"] = { saveTo = dbCheck.customPreset.position, saveKey = "anchor" }, + ["position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["display.position.point"] = { saveTo = dbCheck.display.position, saveKey = "anchor" }, + ["appearance.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.frameStrata"] = { saveTo = dbCheck.display.layer, saveKey = "strata" }, + ["display.visibility.fade"] = { saveTo = dbCheck.display, saveKey = "fade" }, + ["appearance.backdrop.visible"] = { saveTo = dbCheck.display.background, saveKey = "visible" }, + ["appearance.backdrop.color.r"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "r" }, + ["appearance.backdrop.color.g"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "g" }, + ["appearance.backdrop.color.b"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "b" }, + ["appearance.backdrop.color.a"] = { saveTo = dbCheck.display.background.colors.bg, saveKey = "a" }, + ["font.family"] = { saveTo = dbCheck.display.text.font, saveKey = "family" }, + ["font.size"] = { saveTo = dbCheck.display.text.font, saveKey = "size" }, + ["font.color.r"] = { saveTo = dbCheck.display.text.font.color, saveKey = "r" }, + ["font.color.g"] = { saveTo = dbCheck.display.text.font.color, saveKey = "g" }, + ["font.color.b"] = { saveTo = dbCheck.display.text.font.color, saveKey = "b" }, + ["font.color.a"] = { saveTo = dbCheck.display.text.font.color, saveKey = "a" }, + ["removals.statusBars"] = { saveTo = dbCheck.removals, saveKey = "xpBar" }, + ["notifications.maxReminder"] = { saveTo = dbCheck.notifications.statusNotice, saveKey = "maxReminder" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) wt.RemoveMismatch(dbcCheck, dbcSample, { - ["mouseover"] = { saveTo = dbSample.display.fade, saveKey = "enabled" }, + ["mouseover"] = { saveTo = dbCheck.display.fade, saveKey = "enabled" }, }) --Check the display visibility values diff --git a/RemainingXP/RemainingXP-BCC.toc b/RemainingXP/RemainingXP-BCC.toc index fd3d643..aa0c706 100644 --- a/RemainingXP/RemainingXP-BCC.toc +++ b/RemainingXP/RemainingXP-BCC.toc @@ -1,7 +1,7 @@ ## Interface: 20504 ## Title: Remaining XP |TInterface/AddOns/RemainingXP/Textures/Logo.tga:0|t -## Version: 2.3 -## X-Day: 23 +## Version: 2.3.1 +## X-Day: 24 ## X-Month: 7 ## X-Year: 2023 ## Author: Barnabas Nagy (Arxareon) diff --git a/RemainingXP/RemainingXP-Classic.toc b/RemainingXP/RemainingXP-Classic.toc index c39e100..a6c1ca2 100644 --- a/RemainingXP/RemainingXP-Classic.toc +++ b/RemainingXP/RemainingXP-Classic.toc @@ -1,8 +1,8 @@ ## Interface: 11403 ## Title: Remaining XP |TInterface/AddOns/RemainingXP/Textures/Logo.tga:0|t ## IconTexture: Interface/AddOns/RemainingXP/Textures/Logo.tga -## Version: 2.3 -## X-Day: 23 +## Version: 2.3.1 +## X-Day: 24 ## X-Month: 7 ## X-Year: 2023 ## Author: Barnabas Nagy (Arxareon) diff --git a/RemainingXP/RemainingXP-Mainline.toc b/RemainingXP/RemainingXP-Mainline.toc index d98eecf..f9e59f2 100644 --- a/RemainingXP/RemainingXP-Mainline.toc +++ b/RemainingXP/RemainingXP-Mainline.toc @@ -1,8 +1,8 @@ ## Interface: 100105 ## Title: Remaining XP ## IconTexture: Interface/AddOns/RemainingXP/Textures/Logo.tga -## Version: 2.3 -## X-Day: 23 +## Version: 2.3.1 +## X-Day: 24 ## X-Month: 7 ## X-Year: 2023 ## Author: Barnabas Nagy (Arxareon) diff --git a/RemainingXP/RemainingXP-Wrath.toc b/RemainingXP/RemainingXP-Wrath.toc index 56f7ead..b411d72 100644 --- a/RemainingXP/RemainingXP-Wrath.toc +++ b/RemainingXP/RemainingXP-Wrath.toc @@ -1,8 +1,8 @@ ## Interface: 30402 ## Title: Remaining XP |TInterface/AddOns/RemainingXP/Textures/Logo.tga:0|t ## IconTexture: Interface/AddOns/RemainingXP/Textures/Logo.tga -## Version: 2.3 -## X-Day: 23 +## Version: 2.3.1 +## X-Day: 24 ## X-Month: 7 ## X-Year: 2023 ## Author: Barnabas Nagy (Arxareon) diff --git a/RemainingXP/RemainingXP.toc b/RemainingXP/RemainingXP.toc index 9de8f70..7b2bd7e 100644 --- a/RemainingXP/RemainingXP.toc +++ b/RemainingXP/RemainingXP.toc @@ -1,8 +1,8 @@ ## Interface: 100105 #Fallback to the Mainline version ## Title: Remaining XP ## IconTexture: Interface/AddOns/RemainingXP/Textures/Logo.tga -## Version: 2.3 -## X-Day: 23 +## Version: 2.3.1 +## X-Day: 24 ## X-Month: 7 ## X-Year: 2023 ## Author: Barnabas Nagy (Arxareon) diff --git a/RemainingXP/Resources.lua b/RemainingXP/Resources.lua index e78a73e..e21341c 100644 --- a/RemainingXP/Resources.lua +++ b/RemainingXP/Resources.lua @@ -226,6 +226,8 @@ local changelogDB = { "The XP Display size will now properly be able to be set again via Settings after applying a preset.", "The default XP Status Bar will now be hidden again after exiting Edit Mode if the \"Hide default XP bar\" option is enabled.", "Other small fixes, changes & improvements.", + "#F_Hotfix (2.3.1 7/24/2023):_#", + "Addon data recovery will now work properly when loading old data.", }, }