4.0.0-dev1

RainbowTabitha · Oct 4, 2024 · 22a1617 · 22a1617
1 parent b7953da
commit 22a1617
Show file tree

Hide file tree

Showing 13 changed files with 3,778 additions and 1,740 deletions.
diff --git a/.github/workflows/darwin-arm64.yml b/.github/workflows/darwin-arm64.yml
@@ -22,7 +22,7 @@ jobs:
       run: cd "/Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist/" && rm "Mario Party Toolkit"
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: MarioPartyToolkit-darwin_arm64
         path: /Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist

diff --git a/assets/items/goldenMushroom4.png b/assets/items/goldenMushroom4.png
diff --git a/assets/items/hiddenBlockCard.png b/assets/items/hiddenBlockCard.png
diff --git a/assets/items/mushroom4.png b/assets/items/mushroom4.png
diff --git a/codes/marioParty4.py b/codes/marioParty4.py
@@ -132,7 +132,7 @@ def getBooHouseMinimum(min, minDec):
 040A19B0 3BA0{min}
 '''
 
-def getItemModsFour(oneP, oneW, twoP, twoW, threeP, threeW, fourP, fourW, fiveP, fiveW, sixP, sixW, sevenP, sevenW, eightP, eightW, nineP, nineW, tenP, tenW, elevenP, elevenW, twelveP, twelveW, thirteenP, thirteenW, fourteenP, fourteenW, minCoins):
+def getItemModsFour(oneP, oneW, twoP, twoW, threeP, threeW, fourP, fourW, fiveP, fiveW, sixP, sixW, sevenP, sevenW, eightP, eightW, nineP, nineW, tenP, tenW, elevenP, elevenW, twelveP, twelveW, thirteenP, thirteenW, fourteenP, fourteenW, minCoins, extOneP, extOneW, extTwoP, extTwoW, extThreeP, extThreeW, extFourP, extFourW, extFiveP, extFiveW):
     return f'''
 MP4 - Item Modifer
 C2083878 0000001E

diff --git a/codes/marioParty7.py b/codes/marioParty7.py
diff --git a/events/marioParty4_items.py b/events/marioParty4_items.py
diff --git a/events/marioParty5_bonusStarReplace.py b/events/marioParty5_bonusStarReplace.py
@@ -15,7 +15,7 @@ def customBonusStarEvent_mp5(star1, star2, star3, stars5):
     starSlot2 = star2.get()
     starSlot3 = star3.get()
 
-    starHex = ["NONE", "881D0014", "881D0015", "881D0016", "881D0017", "881D0018", "881D0019", "A81D0020", "A81D0022", "A883001C", "A883001E", "A8830022", "A81D0026", "A81D0034"]
+    starHex = ["NONE", "881D0014", "881D0015", "881D0016", "881D0017", "881D0018", "881D0019", "A81D0020", "A81D0022", "A81D0026", "A81D0034"]
 
     starSlot1Num = stars5.index(starSlot1)
     starSlot1Hex = starHex[starSlot1Num]

diff --git a/events/marioParty7_items.py b/events/marioParty7_items.py
diff --git a/frames/marioParty4_frame.py b/frames/marioParty4_frame.py
diff --git a/frames/marioParty6_frame.py b/frames/marioParty6_frame.py
@@ -671,7 +671,7 @@ def toggle_hide_custom():
     parse_stars_button = ctk.CTkButton(master=tabview.tab("Star Handicaps"), command=lambda: handicapEvent_mp6(p1Stars, p2Stars, p3Stars, p4Stars), text="Generate Codes")
     parse_stars_button.place(x=10, y=800)
 
-    stars6 = ["None", "Blue Star", "Red Star", "Character Space Star", "Happening Star", "Duel Star", "Chance Time Star", "Bowser Star", "DK Star", "Minigame Star", "Current Coins Star", "Coin Star", "Star Star", "Orb Star"]
+    stars6 = ["None", "Blue Star", "Red Star", "Character Space Star", "Happening Star", "Bowser Star", "Chance Time Star", "Duel Star", "DK Star", "Minigame Star", "Current Coins Star", "Coin Star", "Star Star", "Orb Star"]
 
     label = ctk.CTkLabel(master=tabview.tab("Bonus Star Replacement"), text=" Replace Minigame Star with:  ", font=("Arial", 16))
     label.grid(row=0, column=0, sticky="w")
@@ -733,4 +733,4 @@ def toggle_hide_custom():
     parse_stars_button.place(x=10, y=800)
 
     return frame
-
+
diff --git a/frames/marioParty7_frame.py b/frames/marioParty7_frame.py
diff --git a/version.py b/version.py
@@ -5,4 +5,4 @@
 # License: MIT
 # ============================================
 
-versionString = "3.30"
+versionString = "4.0.0-DEV"