Merge pull request #51 from NoobTaco/50-xiv-databar-integration-

NoobTaco · Sep 10, 2024 · d481db0 · d481db0
2 parents 9df7e06 + a867410
commit d481db0
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 125 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,9 +39,7 @@ luac.out
 *.x86_64
 *.hex
 
-<<<<<<< HEAD
 .vscode
-=======
-.vscode
-
->>>>>>> 1.4.2
+.editorconfig
+.pkgmeta
+.README.bbc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Changelog
 
+### [1.5.1]
+
+-   Refactored some code and broke integrations into their own sections code wise.
+-   Added integration for Baganator. Will disable ElvUI bags.
+-   Added integration for XIV_Databar. Will disable bottom data bars and move bottom of UI up to fit XIV
+
 ### [1.5.0]
 
 -   Added new feature to customize the color scheme of the UI.

diff --git a/Media/SharedMedia.lua b/Media/SharedMedia.lua
@@ -5,62 +5,62 @@ if LSM == nil then
 end
 
 -- Montserrat
-LSM:Register("font", "Montserrat-Black", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Montserrat-Black.ttf]])
-LSM:Register("font", "Montserrat-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Montserrat-Bold.ttf]])
-LSM:Register("font", "Montserrat-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Montserrat-Medium.ttf]])
-LSM:Register("font", "Montserrat-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Montserrat-Regular.ttf]])
-LSM:Register("font", "Montserrat-SemiBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Montserrat-SemiBold.ttf]])
+LSM:Register("font", "Montserrat-Black", [[Interface\AddOns\NoobTacoUI\media\Fonts\Montserrat-Black.ttf]])
+LSM:Register("font", "Montserrat-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Montserrat-Bold.ttf]])
+LSM:Register("font", "Montserrat-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Montserrat-Medium.ttf]])
+LSM:Register("font", "Montserrat-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Montserrat-Regular.ttf]])
+LSM:Register("font", "Montserrat-SemiBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Montserrat-SemiBold.ttf]])
 
 -- Roboto
-LSM:Register("font", "Roboto-Black", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Roboto-Black.ttf]])
-LSM:Register("font", "Roboto-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Roboto-Bold.ttf]])
-LSM:Register("font", "Roboto-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Roboto-Medium.ttf]])
-LSM:Register("font", "Roboto-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Roboto-Regular.ttf]])
+LSM:Register("font", "Roboto-Black", [[Interface\AddOns\NoobTacoUI\media\Fonts\Roboto-Black.ttf]])
+LSM:Register("font", "Roboto-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Roboto-Bold.ttf]])
+LSM:Register("font", "Roboto-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Roboto-Medium.ttf]])
+LSM:Register("font", "Roboto-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Roboto-Regular.ttf]])
 
 -- Lato
-LSM:Register("font", "Lato-Black", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Lato-Black.ttf]])
-LSM:Register("font", "Lato-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Lato-Bold.ttf]])
-LSM:Register("font", "Lato-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Lato-Regular.ttf]])
+LSM:Register("font", "Lato-Black", [[Interface\AddOns\NoobTacoUI\media\Fonts\Lato-Black.ttf]])
+LSM:Register("font", "Lato-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Lato-Bold.ttf]])
+LSM:Register("font", "Lato-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Lato-Regular.ttf]])
 
 -- Dosis
-LSM:Register("font", "Dosis-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-Bold.ttf]])
-LSM:Register("font", "Dosis-ExtraBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-ExtraBold.ttf]])
-LSM:Register("font", "Dosis-ExtraLight", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-ExtraLight.ttf]])
-LSM:Register("font", "Dosis-Light", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-Light.ttf]])
-LSM:Register("font", "Dosis-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-Medium.ttf]])
-LSM:Register("font", "Dosis-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-Regular.ttf]])
-LSM:Register("font", "Dosis-SemiBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Dosis-SemiBold.ttf]])
+LSM:Register("font", "Dosis-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-Bold.ttf]])
+LSM:Register("font", "Dosis-ExtraBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-ExtraBold.ttf]])
+LSM:Register("font", "Dosis-ExtraLight", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-ExtraLight.ttf]])
+LSM:Register("font", "Dosis-Light", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-Light.ttf]])
+LSM:Register("font", "Dosis-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-Medium.ttf]])
+LSM:Register("font", "Dosis-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-Regular.ttf]])
+LSM:Register("font", "Dosis-SemiBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Dosis-SemiBold.ttf]])
 
 -- Exo2
-LSM:Register("font", "Exo2-Black", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-Black.ttf]])
-LSM:Register("font", "Exo2-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-Bold.ttf]])
-LSM:Register("font", "Exo2-ExtraBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-ExtraBold.ttf]])
-LSM:Register("font", "Exo2-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-Medium.ttf]])
-LSM:Register("font", "Exo2-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-Regular.ttf]])
-LSM:Register("font", "Exo2-SemiBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Exo2-SemiBold.ttf]])
+LSM:Register("font", "Exo2-Black", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-Black.ttf]])
+LSM:Register("font", "Exo2-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-Bold.ttf]])
+LSM:Register("font", "Exo2-ExtraBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-ExtraBold.ttf]])
+LSM:Register("font", "Exo2-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-Medium.ttf]])
+LSM:Register("font", "Exo2-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-Regular.ttf]])
+LSM:Register("font", "Exo2-SemiBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Exo2-SemiBold.ttf]])
 
 -- Mukta
-LSM:Register("font", "Mukta-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-Bold.ttf]])
-LSM:Register("font", "Mukta-ExtraBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-ExtraBold.ttf]])
-LSM:Register("font", "Mukta-ExtraLight", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-ExtraLight.ttf]])
-LSM:Register("font", "Mukta-Light", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-Light.ttf]])
-LSM:Register("font", "Mukta-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-Medium.ttf]])
-LSM:Register("font", "Mukta-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-Regular.ttf]])
-LSM:Register("font", "Mukta-SemiBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Mukta-SemiBold.ttf]])
+LSM:Register("font", "Mukta-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-Bold.ttf]])
+LSM:Register("font", "Mukta-ExtraBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-ExtraBold.ttf]])
+LSM:Register("font", "Mukta-ExtraLight", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-ExtraLight.ttf]])
+LSM:Register("font", "Mukta-Light", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-Light.ttf]])
+LSM:Register("font", "Mukta-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-Medium.ttf]])
+LSM:Register("font", "Mukta-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-Regular.ttf]])
+LSM:Register("font", "Mukta-SemiBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Mukta-SemiBold.ttf]])
 
 -- Poppins
-LSM:Register("font", "Poppins-Black", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Black.ttf]])
-LSM:Register("font", "Poppins-Bold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Bold.ttf]])
-LSM:Register("font", "Poppins-ExtraBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-ExtraBold.ttf]])
-LSM:Register("font", "Poppins-ExtraLight", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-ExtraLight.ttf]])
-LSM:Register("font", "Poppins-Italic", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Italic.ttf]])
-LSM:Register("font", "Poppins-Medium", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Medium.ttf]])
-LSM:Register("font", "Poppins-Regular", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Regular.ttf]])
-LSM:Register("font", "Poppins-SemiBold", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-SemiBold.ttf]])
-LSM:Register("font", "Poppins-Thin", [[Interface\AddOns\NoobTacoUI\Media\Fonts\Poppins-Thin.ttf]])
+LSM:Register("font", "Poppins-Black", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Black.ttf]])
+LSM:Register("font", "Poppins-Bold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Bold.ttf]])
+LSM:Register("font", "Poppins-ExtraBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-ExtraBold.ttf]])
+LSM:Register("font", "Poppins-ExtraLight", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-ExtraLight.ttf]])
+LSM:Register("font", "Poppins-Italic", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Italic.ttf]])
+LSM:Register("font", "Poppins-Medium", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Medium.ttf]])
+LSM:Register("font", "Poppins-Regular", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Regular.ttf]])
+LSM:Register("font", "Poppins-SemiBold", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-SemiBold.ttf]])
+LSM:Register("font", "Poppins-Thin", [[Interface\AddOns\NoobTacoUI\media\Fonts\Poppins-Thin.ttf]])
 
 -- Audio
-LSM:Register("sound", "NT_Chest", [[Interface\AddOns\NoobTacoUI\Media\Audio\nt_sd_chest.ogg]])
-LSM:Register("sound", "NT_Group", [[Interface\AddOns\NoobTacoUI\Media\Audio\nt_sd_groupnpc.ogg]])
-LSM:Register("sound", "NT_Mount", [[Interface\AddOns\NoobTacoUI\Media\Audio\nt_sd_mount.ogg]])
-LSM:Register("sound", "NT_NPC", [[Interface\AddOns\NoobTacoUI\Media\Audio\nt_sd_npc.ogg]])
+LSM:Register("sound", "NT_Chest", [[Interface\AddOns\NoobTacoUI\media\Audio\nt_sd_chest.ogg]])
+LSM:Register("sound", "NT_Group", [[Interface\AddOns\NoobTacoUI\media\Audio\nt_sd_groupnpc.ogg]])
+LSM:Register("sound", "NT_Mount", [[Interface\AddOns\NoobTacoUI\media\Audio\nt_sd_mount.ogg]])
+LSM:Register("sound", "NT_NPC", [[Interface\AddOns\NoobTacoUI\media\Audio\nt_sd_npc.ogg]])
diff --git a/NoobTacoUI.toc b/NoobTacoUI.toc
@@ -10,7 +10,8 @@
 ## X-Curse-Project-ID: 414874
 ## X-Wago-ID: 9rN49x6D
 
-Libraries\Load_Libraries.xml
-Media\Load_Media.xml
-Code.lua
-modules\load_modules.xml
+libraries\Load_Libraries.xml
+media\Load_Media.xml
+core\Code.lua
+modules\load_modules.xml
+integrations\load_integrations.xml
diff --git a/Code.lua → core/Code.lua b/Code.lua → core/Code.lua
@@ -120,7 +120,7 @@ local InstallerData = {
     -- Title = format("|cff4beb2c%s %s|r", MyPluginName, "Installation - Ver: %d", Version),
     Title = format("|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r |cff4beb2cInstallation|r %s", Version),
     Name = MyPluginName,
-    tutorialImage = "Interface\\AddOns\\NoobTacoUI\\Media\\Textures\\noobtaco.tga",
+    tutorialImage = "Interface\\AddOns\\NoobTacoUI\\media\\Textures\\noobtaco.tga",
     Pages = {
         [1] = function()
             PluginInstallFrame.SubTitle:SetFormattedText("Welcome to the installation for %s.", MyPluginName)
@@ -223,52 +223,10 @@ local InstallerData = {
                 end
             )
             PluginInstallFrame.Option2:SetText("Healer")
-            -- Check if WA is installed
-            if (C_AddOns.IsAddOnLoaded("WeakAuras")) then
-                if E.Wrath then -- WOTLK
-                    PluginInstallFrame.Option3:Show()
-                    PluginInstallFrame.Option3:SetScript(
-                        "OnClick",
-                        function()
-                            NoobTacoUI:SetupUnitFrames("v3")
-                        end
-                    )
-                    PluginInstallFrame.Option3:SetText("Luxthos WA")
-                end
-            end
-            -- Check if Baganator is loaded and disable ElvUI bags
-            -- TODO: Add more bag mod checks
-            if (C_AddOns.IsAddOnLoaded("Baganator")) then
-                E.private["bags"]["enable"] = false
-            end
-        end,
-        -- [5] = function()
-        --     PluginInstallFrame.SubTitle:SetText("Nameplates")
-        --     PluginInstallFrame.Desc1:SetText(
-        --         "These are the Nameplate Options available. Please click a button below to apply the layout of your choosing."
-        --     )
-        --     PluginInstallFrame.Desc2:SetText("Importance: |cff07D400High|r")
-
-        --     -- Option 1
-        --     PluginInstallFrame.Option1:Show()
-        --     PluginInstallFrame.Option1:SetScript(
-        --         "OnClick",
-        --         function()
-        --             NoobTacoUI:SetupNamePlatesLayout("v1")
-        --         end
-        --     )
-        --     PluginInstallFrame.Option1:SetText("Old: NoobTacoUI")
 
-        --     -- Option 2
-        --     PluginInstallFrame.Option2:Show()
-        --     PluginInstallFrame.Option2:SetScript(
-        --         "OnClick",
-        --         function()
-        --             NoobTacoUI:SetupNamePlatesLayout("v2")
-        --         end
-        --     )
-        --     PluginInstallFrame.Option2:SetText("New: BlizzLike")
-        -- end,
+            -- Integration Check
+            NoobTacoUI:SetupIntegration()
+        end,
         [5] = function()
             PluginInstallFrame.SubTitle:SetText("Installation Complete")
             PluginInstallFrame.Desc1:SetText(
@@ -287,8 +245,8 @@ local InstallerData = {
         [2] = "Profiles",
         [3] = "General Layout",
         [4] = "Layouts",
-        [5] = "Nameplate",
-        [6] = "Installation Complete"
+        -- [5] = "Nameplate",
+        [5] = "Installation Complete"
     },
     StepTitlesColor = {1, 1, 1},
     StepTitlesColorSelected = {0, 179 / 255, 1},

diff --git a/integrations/XIV_Databar/XIV_Databar.lua b/integrations/XIV_Databar/XIV_Databar.lua
@@ -0,0 +1,38 @@
+local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
+
+function NoobTacoUI:XIV_Databar()
+  -- Defaults On
+  E.db["datatexts"]["panels"]["LeftChatDataPanel"]["enable"] = true
+  E.db["datatexts"]["panels"]["RightChatDataPanel"]["enable"] = true
+
+  -- Check if loaded
+  if (C_AddOns.IsAddOnLoaded("XIV_Databar_Continued")) then
+    -- Disable bottom data bars
+    E.db["datatexts"]["panels"]["LeftChatDataPanel"]["enable"] = false
+    E.db["datatexts"]["panels"]["RightChatDataPanel"]["enable"] = false
+
+    -- Move lower UI elements up
+    E.db["movers"]["LeftChatMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,4,30"
+    E.db["movers"]["RightChatMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-4,30"
+
+    E.db["databars"]["experience"]["height"] = 200
+    E.db["databars"]["reputation"]["height"] = 200
+    -- Experience and Reputation bars
+    E.db["movers"]["ExperienceBarMover"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,505,30"
+    E.db["movers"]["ReputationBarMover"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-505,30"
+    -- Stance bar
+    E.db["movers"]["ShiftAB"] = "BOTTOMLEFT,ElvUIParent,BOTTOMLEFT,514,30"
+    -- Action bars
+    E.db["movers"]["ElvAB_1"] = "BOTTOM,ElvUIParent,BOTTOM,0,30"
+    E.db["movers"]["ElvAB_6"] = "BOTTOM,ElvUIParent,BOTTOM,0,66"
+    E.db["movers"]["ElvAB_2"] = "BOTTOMRIGHT,ElvUIParent,BOTTOMRIGHT,-514,30"
+    E.db["movers"]["ElvAB_3"] = "BOTTOM,ElvUIParent,BOTTOM,-285,30"
+    E.db["movers"]["ElvAB_5"] = "BOTTOM,ElvUIParent,BOTTOM,285,30"
+    -- Player castbar
+    E.db["movers"]["ElvUF_PlayerCastbarMover"] = "BOTTOM,ElvUIParent,BOTTOM,0,101"
+    -- PowerBarContainerMover
+    E.db["movers"]["PowerBarContainerMover"] = "BOTTOM,ElvUIParent,BOTTOM,0,105"
+
+    print("XIV Databar Continued is loaded!")
+  end
+end
diff --git a/integrations/bags/bags.lua b/integrations/bags/bags.lua
@@ -0,0 +1,12 @@
+local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
+
+function NoobTacoUI:IntegrationBag()
+  -- Defaults On
+  E.private["bags"]["enable"] = true
+
+  -- TODO: Add more bag mod checks
+  if (C_AddOns.IsAddOnLoaded("Baganator")) then
+    E.private["bags"]["enable"] = false
+    print("Baganator is loaded. Disabling NoobTacoUI bag integration.")
+  end
+end
diff --git a/integrations/integrations.lua b/integrations/integrations.lua
@@ -0,0 +1,8 @@
+local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
+
+function NoobTacoUI:SetupIntegration(layout, wowver)
+  NoobTacoUI:IntegrationBag()
+  NoobTacoUI:XIV_Databar()
+end
+
+-- TODO: Cell integration code goes here
diff --git a/integrations/load_integrations.xml b/integrations/load_integrations.xml
@@ -0,0 +1,6 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="integrations.lua"/>
+	<Script file="bags/bags.lua"/>
+	<Script file="XIV_Databar/XIV_Databar.lua"/>
+
+</Ui>
diff --git a/modules/General.lua b/modules/General.lua
@@ -6,6 +6,7 @@ local NoobTacoUI, E, L, V, P, G = unpack(select(2, ...))
         - Updated the font used for general UI to "Poppins-SemiBold"
         - Adjusted the colors for general UI
         - Increased the font size for general UI
+        - Adjusted the size pvpsubzone, pvpzone, questsmall, questtext, questtitle, talkingtext, talkingtitle, worldsubzone, worldzone fonts
 ]]
 function NoobTacoUI:SetupGeneral()
     --	PrivateDB
@@ -34,32 +35,30 @@ function NoobTacoUI:SetupGeneral()
     end
 
     E.db["general"]["font"] = "Poppins-SemiBold"
-
     E.db["general"]["fonts"]["cooldown"]["font"] = "Poppins-Bold"
     E.db["general"]["fonts"]["errortext"]["font"] = "Poppins-Bold"
     E.db["general"]["fonts"]["mailbody"]["enable"] = true
     E.db["general"]["fonts"]["mailbody"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["objective"]["enable"] = true
     E.db["general"]["fonts"]["objective"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["pvpsubzone"]["enable"] = true
-    E.db["general"]["fonts"]["pvpsubzone"]["font"] = "Poppins-Medium"
+    E.db["general"]["fonts"]["pvpsubzone"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["pvpzone"]["enable"] = true
-    E.db["general"]["fonts"]["pvpzone"]["font"] = "Poppins-SemiBold"
+    E.db["general"]["fonts"]["pvpzone"]["font"] = "Poppins-Bold"
     E.db["general"]["fonts"]["questsmall"]["enable"] = true
     E.db["general"]["fonts"]["questsmall"]["font"] = "Poppins-Medium"
     E.db["general"]["fonts"]["questtext"]["enable"] = true
-    E.db["general"]["fonts"]["questtext"]["font"] = "Poppins-Regular"
+    E.db["general"]["fonts"]["questtext"]["font"] = "Poppins-Medium"
     E.db["general"]["fonts"]["questtitle"]["enable"] = true
     E.db["general"]["fonts"]["questtitle"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["talkingtext"]["enable"] = true
     E.db["general"]["fonts"]["talkingtext"]["font"] = "Poppins-Medium"
     E.db["general"]["fonts"]["talkingtitle"]["enable"] = true
     E.db["general"]["fonts"]["talkingtitle"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["worldsubzone"]["enable"] = true
-    E.db["general"]["fonts"]["worldsubzone"]["font"] = "Poppins-Medium"
+    E.db["general"]["fonts"]["worldsubzone"]["font"] = "Poppins-SemiBold"
     E.db["general"]["fonts"]["worldzone"]["enable"] = true
-    E.db["general"]["fonts"]["worldzone"]["font"] = "Poppins-SemiBold"
-
+    E.db["general"]["fonts"]["worldzone"]["font"] = "Poppins-Bold"
     E.db["general"]["lootRoll"]["nameFont"] = "Poppins-SemiBold"
     E.db["general"]["fontSize"] = 14
     E.db["general"]["autoTrackReputation"] = true