1.5.0?

RainbowTabitha · Jan 19, 2024 · 0e6059a · 0e6059a
1 parent 42be2ae
commit 0e6059a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,12 +5,9 @@ on:
   pull_request:
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest, macos-latest]
-
+  build-win32-dynamic:
+    name: "Windows: Dynamic Build"
+    runs-on: windows-latest
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -20,19 +17,28 @@ jobs:
 
     - name: Build Project (Dynamic build)
       if: matrix.os == 'windows-latest'
-      run: pyinstaller --noconsole --name="Mario Party Toolkit" --add-data "assets/*;assets/" --distpath=dynamic --icon="assets/diceBlock.ico" main.py
+      run: pyinstaller --noconsole --name="Mario Party Toolkit" --add-data "assets/*;assets/" --icon="assets/diceBlock.ico" main.py
 
-    - name: Build Project (Static build)
+    - name: Upload Artifact
       if: matrix.os == 'windows-latest'
-      run: pyinstaller --onefile --noconsole --name="Mario Party Toolkit" --add-data "assets/*;assets/" --icon="assets/diceBlock.ico" main.py
+      uses: actions/upload-artifact@v2
+      with:
+        name: MarioPartyToolkit-win32-dynamic
+        path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dist
 
-    - name: Build Project (macOS build)
-      if: matrix.os == 'macos-latest'
-      run: pyinstaller --onefile --noconsole --name="Mario Party Toolkit" --add-data "assets/*:assets/" --icon="assets/diceBlock.ico" main.py
+  build-win32-static:
+    name: "Windows: Static Build"
+    runs-on: windows-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-    - name: Purge Files (macOS build)
-      if: matrix.os == 'macos-latest'
-      run: cd "/Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist/" && rm "Mario Party Toolkit"
+    - name: Install PIP Modules
+      run: python -m pip install -r requirements.txt
+
+    - name: Build Project (Static build)
+      if: matrix.os == 'windows-latest'
+      run: pyinstaller --onefile --noconsole --name="Mario Party Toolkit" --add-data "assets/*;assets/" --icon="assets/diceBlock.ico" main.py
 
     - name: Upload Artifact
       if: matrix.os == 'windows-latest'
@@ -41,12 +47,43 @@ jobs:
         name: MarioPartyToolkit-win32-static
         path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dist
 
+  build-win32-c-code:
+    name: "Windows: C Code Build"
+    runs-on: windows-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install PIP Modules
+      run: python -m pip install -r requirements.txt
+
+    - name: Build Project
+      if: matrix.os == 'windows-latest'
+      run: python -m nuitka --onefile --enable-plugin=tk-inter --disable-console --standalone --output-filename="Mario Party Toolkit" --output-dir="dist" --include-data-files="assets/*" --windows-icon-from-ico="assets/diceBlock.ico" main.py
+
     - name: Upload Artifact
       if: matrix.os == 'windows-latest'
       uses: actions/upload-artifact@v2
       with:
-        name: MarioPartyToolkit-win32-dynamic
-        path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dynamic
+        name: MarioPartyToolkit-win32-static
+        path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dist
+
+  build-macOS:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install PIP Modules
+      run: python -m pip install -r requirements.txt
+
+    - name: Build Project (macOS build)
+      if: matrix.os == 'macos-latest'
+      run: pyinstaller --onefile --noconsole --name="Mario Party Toolkit" --add-data "assets/*:assets/" --icon="assets/diceBlock.ico" main.py
+
+    - name: Purge Files (macOS build)
+      if: matrix.os == 'macos-latest'
+      run: cd "/Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist/" && rm "Mario Party Toolkit"
 
     - name: Upload Artifact
       if: matrix.os == 'macos-latest'

diff --git a/build_win32.bat b/build_win32.bat
diff --git a/codes.py b/codes.py
@@ -370,8 +370,11 @@ def getStarSpaceCodeEight(amount, negAmount):
 203D7120 38600014
 043D7120 3860{amount}
 E0000000 80008000
-204A0788 3860000A
-044A0788 3860{amount}
+20404B58 2C03000A
+04404B58 2C03{amount}
+E0000000 80008000
+20404C64 38A0FFF6
+04404C64 38A0{negAmount}
 E0000000 80008000
 203E320C 38A0FFEC
 043E320C 38A0{negAmount}
@@ -390,8 +393,11 @@ def getStarSpaceCodeEightGC(amount, negAmount):
 203C5380 38600014
 043C5380 3860{amount}
 E0000000 80008000
-2048E9E8 3860000A
-0448E9E8 3860{amount}
+203FFFAC 2C03000A
+043FFFAC 2C03{amount}
+E0000000 80008000
+203F2EC4 38A0FFF6
+043F2EC4 38A0{negAmount}
 E0000000 80008000
 203D146C 38A0FFEC
 043D146C 38A0{negAmount}

diff --git a/version.py b/version.py
@@ -5,4 +5,4 @@
 # License: MIT
 # ============================================
 
-current_version = "1.4.1"
+current_version = "1.4.2"