From 6128a6666a3924e7e953892759695f9ddb429b74 Mon Sep 17 00:00:00 2001
From: PhlexPlexico <flexing@phlexplexi.co>
Date: Thu, 11 Jul 2024 07:54:58 -0600
Subject: [PATCH] GitHub Actions Update (#101)

* Bump actions version to avoid deprecation.

* Update subrepo, update actions

* Remove Tycoon wallet as it is not yet implemented.

* Attempt to fix broken build issue.

* Update mm3dr repo to fix broken get items.

* Update version.

* Update mm3dr repo one last time.
---
 .github/workflows/build-check.yml  | 17 +++++++++--------
 .github/workflows/create-build.yml |  9 +++++----
 Z3DR                               |  2 +-
 source/include/version.hpp         |  2 +-
 source/settings.cpp                |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index 3410344..e19a511 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -4,13 +4,13 @@ on:
   pull_request:
 
 jobs:
-  format:
-    name: Verify Formatting
-    runs-on: ubuntu-latest
+  # format:
+  #   name: Verify Formatting
+  #   runs-on: ubuntu-latest
 
-    steps:
-    - name: Checkout Project
-      uses: actions/checkout@v3
+  #   steps:
+  #   - name: Checkout Project
+  #     uses: actions/checkout@v4
 
 #    - name: Format Project
 #      uses: DoozyX/clang-format-lint-action@v0.15
@@ -23,11 +23,12 @@ jobs:
     name: Confirm Compilable
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/z3dr/randotools:latest
+      image: ghcr.io/z3dr/randotools:next
+      options: --user 1001
 
     steps:      
     - name: Checkout Project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.1.7
       with:
         submodules: true
 
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
index 8878f3a..80141a8 100644
--- a/.github/workflows/create-build.yml
+++ b/.github/workflows/create-build.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - name: Get Last Nightly Commit and Private Key
@@ -34,7 +34,7 @@ jobs:
           
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.3.0
+        uses: metcalfc/changelog-generator@v4.3.1
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
           base-ref: ${{ env.last_nightly }}
@@ -47,11 +47,12 @@ jobs:
     name: Build CIA and 3DSX Files
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/z3dr/randotools:latest
+      image: ghcr.io/z3dr/randotools:next
+      options: --user 1001
 
     steps:
       - name: Checkout Project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.7
         with:
           submodules: true
 
diff --git a/Z3DR b/Z3DR
index d01e2bb..4aecaa9 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit d01e2bb9af512aaf11e89fa3fcc0fb57b5f3bbe4
+Subproject commit 4aecaa9c2bb1e36e7fd09cc4b9087188bcdd203d
diff --git a/source/include/version.hpp b/source/include/version.hpp
index 125eaad..c770968 100644
--- a/source/include/version.hpp
+++ b/source/include/version.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
-#define RANDOMIZER_VERSION "v1.3.4"
+#define RANDOMIZER_VERSION "v1.4.0"
 #define COMMIT_NUMBER "develop"
diff --git a/source/settings.cpp b/source/settings.cpp
index 80ff9be..000e5f4 100644
--- a/source/settings.cpp
+++ b/source/settings.cpp
@@ -144,7 +144,7 @@ namespace Settings {
   Option StartingKokiriSword       = Option::U8("Sword",                  { "Kokiri Sword",     "Razor Sword", "Gilded Sword", "None" },                     { "" }, OptionCategory::Setting, (u8)StartingSwordSetting::STARTINGSWORD_KOKIRI);//1U = StartingSwordSetting::STARTINGSWORD_KOKIRI
   Option StartingGreatFairySword   = Option::U8("Great Fairy Sword",      { "None",             "G. F. S." },                                                { "" });
   Option StartingShield            = Option::U8("Shield",                 { "Hero's Shield",    "Mirror Shield", "None" },                                   { "" }, OptionCategory::Setting, (u8)StartingSheildSetting::STARTINGSHIELD_HERO);//1U = StartingShieldSetting::STARTINGSHIELD_HERO
-  Option StartingWallet            = Option::U8("Wallet Upgrade",         { "None",             "Adult's Wallet",   "Giant's Wallet" ,  "Tycoon's Wallet" }, { "" }, OptionCategory::Setting, (u8)StartingWalletSetting::STARTINGWALLET_NONE);
+  Option StartingWallet            = Option::U8("Wallet Upgrade",         { "None",          "Adult's Wallet",   "Giant's Wallet"/*,  "Tycoon's Wallet"*/ }, { "" }, OptionCategory::Setting, (u8)StartingWalletSetting::STARTINGWALLET_NONE);
   Option StartingHealth            = Option::U8("Health",                 healthOptions,                                                                     { "" });
   Option StartingMagicMeter        = Option::U8("Magic Meter",            { "None",             "Single Magic",     "Double Magic" },                        { "" });
   Option StartingDoubleDefense     = Option::U8("Double Defense",         { "None",             "Double Defense" },                                          { "" });