fix: Empty 1st disadvantage slot

.gitattributes

@@ -1,6 +1,13 @@
+* text working-tree-encoding=UTF-8
+
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
+# For safety
+*.yyp text eol=crlf
+*.yy text eol=crlf
+*.gml text eol=crlf
+
 # Re-classify .yy files (for GMS 2 projects)
 *.yy linguist-language=GML
 *.yyp linguist-language=GML

.github/pr-title-checker-config.json

@@ -1,6 +1,6 @@
 {
 	"CHECKS": {
-		"regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?: )|Merge branch"
+		"regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch"
 	},
 	"MESSAGES": {
 		"failure": "Invalid PR Title. Please use the following formats: `<type>(<optional-scope>): <Short summary>`. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)."

.github/pr_labeler_contents.yml

@@ -40,3 +40,13 @@ labels:
   title: "^perf"
 - label: "Type: Performance"
   body: "(?i)(\\[performance\\]|\\[perf\\])"
+
+- label: "Type: Revert"
+  title: "^revert"
+- label: "Type: Revert"
+  body: "(?i)\\[revert\\]"
+
+- label: "Type: Build"
+  title: "^build"
+- label: "Type: Build"
+  body: "(?i)\\[build\\]"

.github/pull_request_template.md

@@ -1,23 +1,15 @@
 <!--- Make use of markdown lists. They make stuff much easier to read through. -->
-### Purpose
-<!-- With a few sentences, describe why you decided to make these changes/additions. -->
+## Purpose and Description
+<!-- Explain why and what your changes do in simple terms. -->
 - Self-descriptive.
 
-### Describe your changes/additions
-<!-- What your changes do and how. No need to get too technical. Some stuff from this list will also be used for the player release notes. -->
-- Self-descriptive.
-
-### What can/needs to be improved/changed
-<!-- Is there anything that you think can/needs to be improved, or perhaps done using a different approach. -->
-- Nothing.
-
-### Testing done
+## Testing done
 <!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions. -->
 - None, and I understand the risks.
 
-### Related things and/or additional context
+## Related things and/or additional context
 <!-- Other PRs, Discord bug reports, messages, threads, outside docs, screenshots etc. -->
-- None.
+-
 
 <!--- PR title format should be "<type>(<optional-scope>): <Short summary>" -->
 <!--- Commit types can be found at https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types -->

.github/workflows/discord-prerelease-notification.yml

@@ -0,0 +1,22 @@
+name: Discord Release Notification
+on:
+  release:
+    types: [prereleased]
+permissions:
+    contents: read
+jobs:
+  github-releases-to-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: GitHub Releases to Discord
+        uses: SethCohen/github-releases-to-discord@v1.19.0
+        with:
+          webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          username: "GitHub Releases"
+          content: |-
+            <@&1318332223232938014>
+            -# :warning: These builds are auto-generated. They may be **heavily unstable**, in which case try using an older build (10 exist at the same time), or divert to <#1283955919566143561>. :warning:
+          reduce_headings: true

.github/workflows/gamemaker_build.yml

@@ -24,17 +24,18 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
-
-      - name: fetch tags
-        run: git fetch --tags origin
-
+          fetch-depth: 0
+          fetch-tags: true
+
+      # Causing issues with the stable release workflow;
+      # - name: fetch tags
+      #   run: git fetch --tags origin
+
       - name: Set date-time and version info
         id: version_info
         shell: pwsh
         run: |
           # Generate current date-time directly in the format you want
-          git fetch --tags
-
           Write-Output "GITHUB_EVENT_NAME is: $env:GITHUB_EVENT_NAME"
 
           if (-not "${{ inputs.build_date }}") {
@@ -80,29 +81,36 @@ jobs:
         name: Find The yyp File
         run: |
           # Search for .yyp file recursively in the repository
-          $yyp = Get-ChildItem -Path ${{ github.workspace }} -Recurse -Filter *.yyp
+          $yypFiles = Get-ChildItem -Path ${{ github.workspace }} -Recurse -Filter ChapterMaster.yyp
 
           # Check if the file was found
-          if ($yyp.Count -eq 0) {
-          Write-Error "No .yyp file found in the repository"
-          exit 1
+          if ($yypFiles.Count -eq 0) {
+            Write-Error "No .yyp file found in the repository"
+            exit 1
+          }
+
+          $yypPath = $yypFiles[0].FullName
+
+          if ($yypFiles.Count -gt 1) {
+            Write-Host "::warning:: Multiple .yyp files found. Using the first one: $yypPath"
           }
+
           # If found, output the path of the .yyp file
-          Write-Output "YYP file found at: $yyp"
-          "yyp-path=$yyp" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          Write-Output "YYP file found at: $yypPath"
+          "yyp-path=$yypPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
 
       # This step sets up the GameMaker build CLI tool Igor https://github.com/bscotch/igor-setup
       - id: igor_setup
         name: Setup Igor
-        uses: bscotch/igor-setup@v1.1.0
+        uses: bscotch/igor-setup@v1.2.1
         with:
           target-yyp: ${{ steps.find_yyp.outputs.yyp-path }}
           access-key: ${{ secrets.GM_ACCESS_KEY }}
-          
+
       # Update the version.json file with build date and other versioning information
       - id: igor_build
         name: Build with Igor
-        uses: bscotch/igor-build@v1.0.3
+        uses: bscotch/igor-build@v1.1.0
         with:
           yyp-path: ${{ steps.find_yyp.outputs.yyp-path }}
           user-dir: ${{ steps.igor_setup.outputs.user-dir }}

.github/workflows/release_dev.yml

@@ -11,7 +11,7 @@ on:
           - YYC
           - VM
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 22 * * *" # every day at 22:00 UTC
 
 jobs:
   build_needed:
@@ -36,32 +36,55 @@ jobs:
 
           # manual override
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "Manually triggered → build." 
+            echo "Manually triggered → build."
             echo "needed=true" >> $GITHUB_OUTPUT
             exit 0
           fi
 
           # determine commit range since last tag
+          # Use 2>/dev/null to suppress error if no tags exist
           LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
           if [ -n "$LAST_TAG" ]; then
             RANGE="$LAST_TAG..HEAD"
+            echo "Checking commits in range: $RANGE (since last tag '$LAST_TAG')"
           else
-            RANGE="HEAD"
+            RANGE="HEAD" # If no tags, check all commits up to HEAD
+            echo "No previous tags found. Checking all commits up to HEAD."
           fi
-          echo "Commit range: $RANGE"
+
+          # Check if there are *any* commits in the range.
+          # git log -n 1 --format=%H will return the latest commit SHA if there's at least one.
+          # If the range is empty (HEAD is same as LAST_TAG), it returns nothing.
+          COMMITS_IN_RANGE=$(git log $RANGE -n 1 --format=%H 2>/dev/null || echo "")
+
+          if [ -z "$COMMITS_IN_RANGE" ]; then
+            echo "No new commits found in the range '$RANGE'. HEAD is likely the same as the last tag ($LAST_TAG)."
+            echo "Skipping build as no changes since the last tagged build."
+            # needed is already defaulted to false, so we just exit.
+            exit 0
+          fi
+
+          # If we reached here, there are new commits in the range.
+          echo "New commits found in range '$RANGE'. Checking their messages."
 
           # collect all commit messages in range
-          ALL_MSGS=$(git log $RANGE --pretty=%B)
+          ALL_MSGS=$(git log $RANGE --pretty=%s)
           echo "Messages in range:"
-          echo "$ALL_MSGS"
+          # Use sed to indent messages for clarity in logs
+          echo "$ALL_MSGS" | sed 's/^/  /'
 
-          # only skip if every message matches exclude pattern
+          # only build if at least one message does NOT match exclude pattern
+          # The -v option inverts the match; -E enables extended regex; -q suppresses output.
+          # The overall command exits successfully (0) if a non-matching line is found.
           EXCLUDE="^(docs|chore|style|ci)"
           if echo "$ALL_MSGS" | grep -vEq "$EXCLUDE"; then
-            echo "Found non-excluded commit → build needed."
+            echo "Found at least one commit message not matching the exclude pattern '$EXCLUDE'."
+            echo "Build needed."
             echo "needed=true" >> $GITHUB_OUTPUT
           else
-            echo "All commits are docs/chore/style/ci → skipping build."
+            echo "All new commit messages match the exclude pattern '$EXCLUDE'."
+            echo "Skipping build."
+            # needed is already defaulted to false.
           fi
 
   prepare_release:
@@ -92,26 +115,58 @@ jobs:
 
       - name: Cleanup old releases
         run: |
-          # tag_name looks like: branch-name/date
+          set -euo pipefail # Exit immediately if a command exits with a non-zero status
+
+          # tag_name looks like: branch-name/date (e.g., main/2025-05-10-2220)
           TAG_NAME="${{ steps.tag_info.outputs.tag_name }}"
-          BRANCH_SUFFIX="${TAG_NAME%%/*}"
-          PREFIX="${BRANCH_SUFFIX}/"
 
-          echo "Checking releases with prefix: $PREFIX"
+          # Extract the branch prefix from the tag name (e.g., "main/")
+          # This assumes your tag format is always 'branch-name/date'
+          BRANCH_PREFIX="${TAG_NAME%%/*}/"
 
-          # Get tags starting with the prefix, sort reverse chronologically (best effort with default sort)
-          # Using gh release list is more reliable than just git tags if releases exist
-          TAGS=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" | sort -r)
+          echo "Starting cleanup for releases with prefix: ${BRANCH_PREFIX}"
 
-          COUNT=0
+          # --- Added Step: List all tag names found before filtering ---
+          echo "--- All tag names found by 'gh release list --json tagName': ---"
+          # Get all tag names first
+          ALL_TAG_NAMES=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' || true)
+          if [ -z "$ALL_TAG_NAMES" ]; then
+            echo "No releases found at all."
+          else
+             echo "$ALL_TAG_NAMES" | cat -n # List all found tags with line numbers
+          fi
+          echo "-----------------------------------------------------------"
+
+
+          # Get tag names starting with the prefix, sort reverse chronologically by tag name.
+          # We use the previously fetched ALL_TAG_NAMES to avoid calling gh release list again
+          # Use || true at the end of the pipe to prevent the step from failing if no releases match the prefix
+          TAGS_TO_PROCESS=$(echo "$ALL_TAG_NAMES" | grep "^${BRANCH_PREFIX}" | sort -r || true)
+
+          if [ -z "$TAGS_TO_PROCESS" ]; then
+            echo "No releases found matching prefix '${BRANCH_PREFIX}'. No cleanup needed."
+            exit 0
+          fi
+
+          # --- The rest of the logic (count, keep, delete) remains the same ---
+          # Count the filtered tags
+          NUM_MATCHING=$(echo "$TAGS_TO_PROCESS" | wc -l)
           RELEASES_TO_KEEP=10 # How many releases per branch prefix to keep
-          for TAG in $TAGS; do
+          echo "Found ${NUM_MATCHING} releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP."
+
+          COUNT=0
+          IFS=$'\n' # Set IFS to newline to correctly iterate over tags
+          for TAG in $TAGS_TO_PROCESS; do
             COUNT=$((COUNT + 1))
             if [ $COUNT -gt $RELEASES_TO_KEEP ]; then
               echo "Deleting old release+tag: $TAG"
-              gh release delete "$TAG" -y --cleanup-tag || echo "Failed to delete release $TAG, maybe already deleted?"
+              gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already."
+            else
+              echo "Keeping release+tag: $TAG (it's within the latest $RELEASES_TO_KEEP)"
             fi
           done
+          unset IFS # Reset IFS
+
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needs permissions to delete releases/tags
 
@@ -156,14 +211,13 @@ jobs:
 
       - id: create_release
         name: Create a release and upload the build
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: ${{ steps.prep_release_name.outputs.release_name }}
+          token: ${{ secrets.RELEASE_TOKEN_SECRET }}
           tag_name: ${{ needs.prepare_release.outputs.tag_name }}
           prerelease: true
           generate_release_notes: true
           make_latest: false
           files: |
             ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_stable.yml

@@ -9,27 +9,29 @@ jobs:
     uses: ./.github/workflows/gamemaker_build.yml
     secrets: inherit
     with:
-      build_date: ""
       yyc: true
+      build_date: ""
   release:
     name: Release
-    runs-on: windows-2022
+    runs-on: ubuntu-latest
     needs: gamemaker_build
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v4
-        with:
-          lfs: true
-      - name: Download built file artifact
+      - id: download_artifact
+        name: Download built file artifact
         uses: actions/download-artifact@v4
         with:
           name: built-file
           path: ./build_output
+
       - id: create_release
-        name: Create Release
-        uses: softprops/action-gh-release@v2.0.9
+        name: Create a release and upload the build
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: ChapterMaster ${{ github.ref_name }}
           tag_name: ${{ github.ref_name }}
+          token: ${{ secrets.RELEASE_TOKEN_SECRET }}
           prerelease: false
           generate_release_notes: true
           make_latest: true

.github/workflows/stale_labeler.yml

@@ -1,7 +1,7 @@
 name: "Mark stale issues and PRs"
 on:
   schedule:
-    - cron: '0 0 * * *'  # every day at midnight UTC
+    - cron: '0 22 * * *'  # every day at 22:00 UTC
 
 jobs:
   stale:

.gitignore

@@ -12,3 +12,10 @@ ChapterMaster.resource_order
 
 tmp/
 stitch.config.json
+
+objects/obj_garbage_collector/
+
+# If all of your sprite sources are in this repo you can stick a "!" in front of this to track this file. Otherwise this file is machine-specific and should be ignored.
+sprites.import.json
+# This is a cache file for speeding up subsequent pipeline operations. It should not be tracked in git.
+sprites.info.json