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.
Z3DR · Jul 11, 2024 · 6128a66 · 6128a66
1 parent 35f3e7a
commit 6128a66
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git 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/[email protected]
@@ -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
@@ -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/[email protected].0
+        uses: metcalfc/[email protected].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
diff --git 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
@@ -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" },                                          { "" });
+1 −1		code/Makefile
+20 −14		code/include/game/actor.h
+2 −2		code/include/game/actorresource.h
+1 −1		code/include/game/as.h
+2 −2		code/include/game/common_data.h
+8 −3		code/include/game/context.h
+1 −0		code/include/game/items.h
+31 −8		code/include/game/player.h
+29 −0		code/include/rnd/actors/dm_char03.h
+31 −0		code/include/rnd/actors/dm_char05.h
+18 −0		code/include/rnd/actors/dm_hina.h
+21 −0		code/include/rnd/actors/en_si.h
+214 −0		code/include/rnd/actors/item00.h
+17 −0		code/include/rnd/actors/item_b_heart.h
+2 −2		code/include/rnd/blastmask.h
+1 −0		code/include/rnd/item_override.h
+4 −2		code/include/rnd/item_table.h
+1 −0		code/include/rnd/link.h
+51 −0		code/include/rnd/models.h
+35 −0		code/include/rnd/objects.h
+77 −15		code/mm.ld
+55 −1		code/source/asm/item_override_hooks.s
+20 −1		code/source/asm/item_override_patches.s
+50 −0		code/source/asm/model_hooks.s
+41 −0		code/source/asm/model_patches.s
+15 −0		code/source/asm/patches.s
+1 −1		code/source/game/actor.cpp
+17 −6		code/source/main.cpp
+27 −0		code/source/rnd/actors/dm_char03.cpp
+52 −0		code/source/rnd/actors/dm_char05.cpp
+21 −0		code/source/rnd/actors/dm_hina.cpp
+22 −0		code/source/rnd/actors/en_si.cpp
+24 −0		code/source/rnd/actors/item00.cpp
+20 −0		code/source/rnd/actors/item_b_heart.cpp
+0 −3		code/source/rnd/custom_entrances.cpp
+134 −5		code/source/rnd/custom_messages.cpp
+0 −3		code/source/rnd/extdata.cpp
+34 −18		code/source/rnd/item_override.cpp
+727 −974		code/source/rnd/item_table.cpp
+6 −0		code/source/rnd/link.cpp
+305 −0		code/source/rnd/models.cpp
+100 −0		code/source/rnd/objects.cpp
+8 −11		code/source/rnd/savefile.cpp