Merge pull request #4 from NoobTaco/develop

Develop
NoobTaco · Aug 13, 2022 · 3513444 · 3513444
2 parents 539b477 + afaf3a2
commit 3513444
Show file tree

Hide file tree

Showing 31 changed files with 728 additions and 1,216 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,37 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Run luacheck
         uses: BigWigsMods/actions/luacheck@master
         with:
           args: -q --ignore 113 631 211 212 112 311
 
-      - name: "Generate recent changes"
+      - name: Generate recent changes
         uses: kemayo/actions-recent-changelog@v1
         with:
           input: CHANGELOG.md
           output: RECENT_CHANGES.md
 
-      - name: Package Retail
-        uses: BigWigsMods/packager@master
+      - name: Package and release
+        uses: BigWigsMods/packager@v2
         with:
           args: -d
-
-      # - name: Package Classic
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -d -g classic
-
-      #   # package for burning crusade
-      # - name: Package for Burning Crusade
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -d -g bcc
-
-      #   # package for Wrath
-      # - name: Package for WOTLK
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -d -g wrath
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,53 +8,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Run luacheck
         uses: BigWigsMods/actions/luacheck@master
         with:
           args: -q --ignore 113 631 211 212 112 311
 
-      - name: "Generate recent changes"
+      - name: Generate recent changes
         uses: kemayo/actions-recent-changelog@v1
         with:
           input: CHANGELOG.md
           output: RECENT_CHANGES.md
 
-      # - name: Package Classic
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -g classic -w 25971
-      #   env:
-      #     CF_API_KEY: ${{ secrets.CF_API_KEY }}
-      #     GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-      #     WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
-      #     WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
-
-      # - name: Package Burning Crusade
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -g bcc -w 25970
-      #   env:
-      #     CF_API_KEY: ${{ secrets.CF_API_KEY }}
-      #     GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-      #     WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
-      #     WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
-
-      # - name: Package WOTLK
-      #   uses: BigWigsMods/packager@master
-      #   with:
-      #     args: -g wrath
-      #   env:
-      #     CF_API_KEY: ${{ secrets.CF_API_KEY }}
-      #     GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-      #     WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
-      #     WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
-
-      - name: Package Retail
-        uses: BigWigsMods/packager@master
+      - name: Package and release
+        uses: BigWigsMods/packager@v2
         env:
           CF_API_KEY: ${{ secrets.CF_API_KEY }}
           GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-          WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
           WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.0.4]
+
+### Updated
+
+-   I present my new redesign of NoobTacoUI. I have cleaned things up for a more minimal look and feel. Please feel free to reach out via support for questions and suggestions.
+
 ## [0.0.1]
 
 -   A new paintjob
+
+## [0.0.0]
diff --git a/Code.lua b/Code.lua
@@ -9,7 +9,7 @@ local ReloadUI = ReloadUI
 local StopMusic = StopMusic
 
 -- Change this line and use a unique name for your plugin.
-local MyPluginName = "|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r V2"
+local MyPluginName = "|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r"
 
 -- Create references to ElvUI internals
 local E, L, V, P, G = unpack(ElvUI)
@@ -104,17 +104,15 @@ local function InstallComplete()
     -- Set a variable tracking the version of the addon when layout was installed
     E.db[MyPluginName].install_version = Version
 
-    -- Set the key for Overlay
-    E.db[MyPluginName].overlay = true
     ReloadUI()
 end
 
 -- PLUGIN INSTALLER -----------------------------------------------------------------
 local InstallerData = {
     -- Title = format("|cff4beb2c%s %s|r", MyPluginName, "Installation - Ver: %d", Version),
-    Title = format("|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r |cff4beb2cInstallation|r %s", Version),
+    Title = format("|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r |cff4beb2cInstallation|r %s", Version),
     Name = MyPluginName,
-    tutorialImage = "Interface\\AddOns\\NoobTacoUIv2\\Media\\Textures\\noobtaco.tga",
+    tutorialImage = "Interface\\AddOns\\NoobTacoUIv2\\Media\\Textures\\noobtacouiv2.tga",
     Pages = {
         [1] = function()
             PluginInstallFrame.SubTitle:SetFormattedText("Welcome to the installation for %s.", MyPluginName)
@@ -129,26 +127,10 @@ local InstallerData = {
         [2] = function()
             PluginInstallFrame.SubTitle:SetText("Profiles")
             PluginInstallFrame.Desc1:SetText(
-                "You can either create a new profile to install NoobTacoUIv2 onto or you can apply NoobTacoUIv2 settings to your current profile")
-            PluginInstallFrame.Desc3:SetText("Your currently active ElvUI profile is: |cffc41f3b" ..
-                                                 ElvUI[1].data:GetCurrentProfile() .. "|r")
-            PluginInstallFrame.Option1:Show()
-            PluginInstallFrame.Option1:SetScript("OnClick", function()
-                NewProfile(false)
-            end)
-            PluginInstallFrame.Option1:SetText("Use Current")
-            PluginInstallFrame.Option2:Show()
-            PluginInstallFrame.Option2:SetScript("OnClick", function()
-                NewProfile(true, "NoobTacoUIv2")
-            end)
-            PluginInstallFrame.Option2:SetText("Create New")
-
-            PluginInstallFrame.SubTitle:SetText("Profiles")
-            PluginInstallFrame.Desc1:SetText(
-                "Press \"Update Current\" to update your current profile with the new NoobTacoUIv2 changes.")
+                "Press \"Update Current\" to update your current profile with the new |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r changes.")
             PluginInstallFrame.Desc2:SetText(
                 "If you'd like to check out what the changes are, without overwriting your current settings, you can press \"Create New\"")
-            PluginInstallFrame.Desc3:SetText("Your currently active ElvUI profile is: |cffc41f3b" ..
+            PluginInstallFrame.Desc3:SetText("Your currently active ElvUI profile is: |cff88c0d0" ..
                                                  ElvUI[1].data:GetCurrentProfile() .. "|r")
             PluginInstallFrame.Option1:Show()
             PluginInstallFrame.Option1:SetScript("OnClick", function()
@@ -162,10 +144,11 @@ local InstallerData = {
             PluginInstallFrame.Option2:SetText("Create New")
         end,
         [3] = function()
-            PluginInstallFrame.SubTitle:SetText(L["General Layout of NoobTacoUIv2"])
-            PluginInstallFrame.Desc1:SetText(L["This is the recommended base layout for NoobTacoUIv2."])
+            PluginInstallFrame.SubTitle:SetText(L["General Layout of |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r"])
+            PluginInstallFrame.Desc1:SetText(
+                L["This is the recommended base layout for |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r."])
             PluginInstallFrame.Desc2:SetText(L["This will set some general settings for the layout installation"])
-            PluginInstallFrame.Desc3:SetFormattedText(L["Importance: |cffFF0000High|r"])
+            PluginInstallFrame.Desc3:SetFormattedText(L["Importance: |cff88c0d0High|r"])
 
             PluginInstallFrame.Option1:Show()
             PluginInstallFrame.Option1:SetScript('OnClick', function()
@@ -174,22 +157,6 @@ local InstallerData = {
             PluginInstallFrame.Option1:SetText("Set Layout")
         end,
         [4] = function()
-            PluginInstallFrame.SubTitle:SetText("Layouts")
-            PluginInstallFrame.Desc1:SetText(
-                "These are the layouts that are available. Please click a button below to apply the layout of your choosing.")
-            PluginInstallFrame.Desc2:SetText("Importance: |cff07D400High|r")
-            PluginInstallFrame.Option1:Show()
-            PluginInstallFrame.Option1:SetScript("OnClick", function()
-                NoobTacoUIv2:SetupUnitFrames("v1")
-            end)
-            PluginInstallFrame.Option1:SetText("DPS or Tank")
-            PluginInstallFrame.Option2:Show()
-            PluginInstallFrame.Option2:SetScript("OnClick", function()
-                NoobTacoUIv2:SetupUnitFrames("v2")
-            end)
-            PluginInstallFrame.Option2:SetText("Healer")
-        end,
-        [5] = function()
             PluginInstallFrame.SubTitle:SetText("Installation Complete")
             PluginInstallFrame.Desc1:SetText(
                 "You have completed the installation process.\nIf you need help or wish to report a bug, please go to http://tukui.org")
@@ -204,8 +171,7 @@ local InstallerData = {
         [1] = "Welcome",
         [2] = "Profiles",
         [3] = "General Layout",
-        [4] = "Layouts",
-        [5] = "Installation Complete"
+        [4] = "Installation Complete"
 
     },
     StepTitlesColor = {1, 1, 1},
@@ -232,7 +198,7 @@ local function InsertOptions()
             header1 = {
                 order = 1,
                 type = "header",
-                name = format("|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r - Ver %s", Version)
+                name = format("|cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r|cfffffb00v2|r - Ver %s", Version)
             },
             description1 = {
                 order = 2,
@@ -244,43 +210,23 @@ local function InsertOptions()
                 type = "description",
                 name = "\n\n\n"
             },
-            header2 = {
-                order = 4,
-                type = "header",
-                name = "Options"
-            },
-            general = {
-                order = 5,
-                type = "group",
-                -- name = MER:cOption(L["General"]),
-                name = "General",
-                guiInline = true,
-                args = {
-                    overlay = {
-                        order = 1,
-                        type = "toggle",
-                        name = L["Elite Overlay"],
-                        desc = L["Disable/Enable the elite dragon overlay for the target."]
-                    }
-                }
-            },
             header3 = {
-                order = 6,
+                order = 4,
                 type = "header",
                 name = "Installation"
             },
             description2 = {
-                order = 7,
+                order = 5,
                 type = "description",
                 name = "The installation guide should pop up automatically after you have completed the ElvUI installation. If you wish to re-run the installation process for this layout then please click the button below."
             },
             spacer2 = {
-                order = 8,
+                order = 6,
                 type = "description",
                 name = ""
             },
             install = {
-                order = 9,
+                order = 7,
                 type = "execute",
                 name = "Install",
                 desc = "Run the installation process.",

diff --git a/Media/Fonts/Lato-Black.ttf b/Media/Fonts/Lato-Black.ttf
diff --git a/Media/Fonts/Lato-Bold.ttf b/Media/Fonts/Lato-Bold.ttf
diff --git a/Media/Fonts/Lato-Regular.ttf b/Media/Fonts/Lato-Regular.ttf
diff --git a/Media/SharedMedia.lua b/Media/SharedMedia.lua
@@ -17,11 +17,6 @@ LSM:Register("font", "Roboto-Bold", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\
 LSM:Register("font", "Roboto-Medium", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Roboto-Medium.ttf]])
 LSM:Register("font", "Roboto-Regular", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Roboto-Regular.ttf]])
 
--- Lato
-LSM:Register("font", "Lato-Black", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Lato-Black.ttf]])
-LSM:Register("font", "Lato-Bold", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Lato-Bold.ttf]])
-LSM:Register("font", "Lato-Regular", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Lato-Regular.ttf]])
-
 -- Dosis
 LSM:Register("font", "Dosis-Bold", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Dosis-Bold.ttf]])
 LSM:Register("font", "Dosis-ExtraBold", [[Interface\AddOns\NoobTacoUIv2\Media\Fonts\Dosis-ExtraBold.ttf]])

diff --git a/Media/Textures/elite.tga b/Media/Textures/elite.tga
diff --git a/Media/Textures/noobtaco.tga b/Media/Textures/noobtaco.tga
diff --git a/Media/Textures/noobtacouiv2.tga b/Media/Textures/noobtacouiv2.tga
diff --git a/Media/Textures/rare.tga b/Media/Textures/rare.tga
diff --git a/Media/Textures/rareelite.tga b/Media/Textures/rareelite.tga
diff --git a/Media/Textures/worldboss.tga b/Media/Textures/worldboss.tga
diff --git a/NoobTacoUIv2.toc b/NoobTacoUIv2.toc
@@ -4,15 +4,12 @@
 ## Interface-Wrath: 30400
 ## Title: |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|rv2
 ## Author: NoobTaco
-## Version: 0.0.1
+## Version: 0.0.4
 ## Notes: Contains layouts from NoobTacoUIv2
 ## RequiredDeps: ElvUI
 ## DefaultState: enabled
-## X-Tukui-ProjectID: 
-## X-Tukui-ProjectFolders: NoobTacoUIv2
-## X-WoWI-ID: 
-## X-Curse-Project-ID: 
-## X-Wago-ID: 
+## X-Curse-Project-ID: 659297
+## X-Wago-ID: RqGY8RKg
 
 Libraries\Load_Libraries.xml
 Media\Load_Media.xml

diff --git a/README.bbc b/README.bbc