Merge branch 'master' into mp4items

.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

.github/workflows/win32.yml

@@ -19,7 +19,7 @@ jobs:
       run: pyinstaller --onefile .\main.py --add-data "assets/eventTags/*;assets/eventTags/" --add-data "assets/icons/*;assets/icons/" --add-data "assets/items/*;assets/items/" --add-data "assets/logos/*;assets/logos/" --add-data "assets/operation/*;assets/operation/" --add-data "dependencies/win32/*;dependencies/win32/" --add-data "dependencies/bin/*;dependencies/win32/bin/"  --name="Mario Party Toolkit" -w --icon="assets/icons/diceBlock.ico"
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: MarioPartyToolkit-win32
         path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dist

CODE_OF_CONDUCT.md

@@ -0,0 +1,68 @@
+# LGBTQ Code of Conduct
+
+## 1. Purpose
+
+The primary goal of The Mario Party Toolkit is to be inclusive of the widest range of contributors with diverse backgrounds. We are committed to providing a friendly, safe, and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This Code of Conduct outlines our expectations for behavior within our community and the consequences for unacceptable actions. We encourage everyone to help us create positive and safe experiences for all participants.
+
+## 2. Open [Source/Culture/Tech] Citizenship
+
+Our Code of Conduct aims to enhance open [source/culture/tech] citizenship by encouraging participants to understand and strengthen the relationship between their actions and their effects on the community.
+
+Communities reflect the societies they inhabit, and positive action is necessary to address various forms of inequality and abuses of power. We recognize and appreciate efforts to foster a welcoming, friendly community that encourages full participation.
+
+## 3. Expected Behavior
+
+We expect all community members to:
+
+- Participate actively and authentically, contributing to the health and longevity of our community.
+- Exercise respect and consideration in speech and actions.
+- Attempt to resolve conflicts through collaboration before escalating them.
+- Avoid demeaning, discriminatory, or harassing behavior and language.
+- Be mindful of your surroundings and fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem minor.
+- Remember that online interactions and contributions should be respectful and constructive.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable:
+
+- Violence, threats of violence, or violent language directed at another person.
+- Sexist, racist, homophobic, transphobic, ableist, or otherwise discriminatory jokes and language.
+- Posting or displaying sexually explicit or violent material.
+- Posting or threatening to post personally identifying information ("doxing").
+- Personal insults related to gender, sexual orientation, race, religion, or disability.
+- Inappropriate or invasive requests for personal information.
+- Unwelcome sexual attention, including sexualized comments, jokes, or advances.
+- Deliberate intimidation, stalking, or following (online or in person).
+- Advocating for or encouraging any of the above behaviors.
+- Sustained disruption of discussions or project-related activities.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and decision-makers, will not be tolerated. Individuals asked to cease unacceptable behavior must comply immediately. Consequences for unacceptable behavior may include temporary bans or permanent expulsion from the project, without warning.
+
+## 6. Reporting Guidelines
+
+If you experience or witness unacceptable behavior or have other concerns, please notify a community organizer as soon as possible. Contact info: #9.
+
+Organizers are available to assist with reporting and providing support in distressing situations.
+
+## 7. Addressing Grievances
+
+If you believe you have been unfairly accused of violating this Code of Conduct, you should notify Nayla or manifestrev with a concise description of your grievance. Your grievance will be addressed according to the policies in the [Commonwealth of Massachusetts](https://malegislature.gov/Laws/GeneralLaws/PartI/TitleXXII/Chapter161A/Section26)
+
+## 8. Scope
+
+All community participants, including contributors, sponsors, and other guests, are expected to adhere to this Code of Conduct in all online interactions and contributions related to the project. This Code of Conduct applies to unacceptable behavior outside of project activities if it negatively impacts the safety and well-being of community members.
+
+## 9. Contact Info
+
+- Discord: endangerednayla
+- Email: [email protected]
+
+## 10. License and Attribution
+
+This LGBTQ Code of Conduct is distributed by Mario Party Netplay under a Creative Commons Attribution-ShareAlike license.
+
+Portions of text are adapted from the Stumptown Syndicate Citizen Code of Conduct and the Geek Feminism Anti-Harassment Policy.

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
-
+