Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

Author: Maleclypse

.clang-tidy

@@ -34,6 +34,7 @@ Checks: [
     -clang-analyzer-core.DivideZero,
     -clang-analyzer-core.NonNullParamChecker,
     -clang-analyzer-core.UndefinedBinaryOperatorResult,
+    -clang-analyzer-cplusplus.InnerPointer,
     -clang-analyzer-cplusplus.NewDelete,
     # We often use enums as bitsets and do things like `enum::A | enum::B`
     # which is explicitly unsupported by this check, and it is officially recommended to disable

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 <!-- HOW TO USE: Under each "#### Heading" below, enter information relevant to your pull request.
 You must have the below headings. Comments like this may be safely removed, if you want.
 
-If you are opening this pull request from Github's web interface, you can use the 'preview' button to see what your pull request will look like to others.
+If you are opening this pull request from GitHub's web interface, you can use the 'preview' button to see what your pull request will look like to others.
 
 Guidelines for pull requests:
 -Keep your changes limited to one specific issue or change, plus the bare minimum related work to make that happen.
@@ -29,7 +29,7 @@ https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt -->
 
 <!-- With a few sentences, describe your reasons for making this change.
 If it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.
-When you submit a pull request that completely resolves an issue, use [Github's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)
+When you submit a pull request that completely resolves an issue, use [GitHub's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)
 to automatically close the issue once your pull request is merged.
 If there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified. -->
 

.github/reviewers.yml

@@ -31,6 +31,8 @@ files:
     - Light-Wave
   'data/mods/MA/**':
     - ZhilkinSerg
+  'data/mods/Sky_Island/**':
+    - gettingusedto
   'data/mods/Tamable_Wildlife/**':
     - Termineitor244
   'data/mods/Limb_WIP/**':

.github/workflows/build-translations.yml

@@ -37,7 +37,7 @@ jobs:
           echo "No TX_TOKEN secret set in this repo, not pulling translations from Transifex"
           exit 1
           fi
-          tx pull -a --force
+          tx pull -a --force -w 2
 
       - name: Discard invalid translations
         run: ./lang/discard_invalid_po.sh

.github/workflows/check-translation.yml

@@ -22,13 +22,18 @@ jobs:
         run: |
           commenter="${{ github.event.comment.user.login }}"
           echo "Debug: Checking comment counts for... $commenter"
-          comment_count=$(gh search prs --owner=CleverRaven --repo=Cataclysm-DDA --commenter $commenter --json id | jq 'length')
+          comment_count_all_PR=$(gh search prs --repo=CleverRaven/Cataclysm-DDA --commenter $commenter --json id | jq 'length')
+          num_PRs_authored=$(gh search prs --repo=CleverRaven/Cataclysm-DDA --author $commenter --json id | jq 'length')
+          
+          num_times_commented=$(gh pr view $PR_NUMBER --json comments --jq "[.comments.[].author.login | match(\"$commenter\")] | length")
 
-          echo "Debug: $commenter with $comment_count total comments, including checked comment."
-          echo "comment_count=$comment_count" >> $GITHUB_OUTPUT
+          echo "Debug: $commenter with $comment_count_all_PR PRs commented on, including checked comment. PR contains $num_times_commented comments from them. They have authored $num_PRs_authored PRs in CleverRaven."
+          echo "comment_count_all_PR=$comment_count_all_PR" >> $GITHUB_OUTPUT
+          echo "num_times_commented=$num_times_commented" >> $GITHUB_OUTPUT
+          echo "num_PRs_authored=$num_PRs_authored" >> $GITHUB_OUTPUT
 
       - name: Greet commenters with no previous comments
-        if: steps.pr-comment-check.outputs.comment_count == 1
+        if: steps.pr-comment-check.outputs.comment_count_all_PR == 1 && steps.pr-comment-check.outputs.num_times_commented == 1 && steps.pr-comment-check.outputs.num_PRs_authored == 0
         run: |
           # I have no earthly idea how to pass the commenter on from the previous run (I have tried), so let's just re-acquire it.
           commenter_name="${{ github.event.comment.user.login }}"

.github/workflows/greet-first-time-comment.yml

@@ -224,11 +224,15 @@ jobs:
           }}
         SKIP_TESTS: ${{ fromJSON(needs.matrix-variables.outputs.skip_tests) || (matrix.android != '') }}
     steps:
-    - name: Maximize build space
+    - name: Maximize build space (ubuntu)
       if: ${{ runner.os == 'Linux' }}
       uses: AdityaGarg8/remove-unwanted-software@v4.1
       with:
         remove-android: ${{ matrix.android == '' }}
+    - name: Maximize build space (mac)
+      if: ${{ runner.os == 'macos' && matrix.android == '' }}
+      run: |
+        sudo rm -rf $ANDROID_HOME
     - name: checkout repository
       if: ${{ env.SKIP == 'false' }}
       uses: actions/checkout@v4
@@ -290,7 +294,7 @@ jobs:
           ccache-master-${{ matrix.ccache_key }}--
     - uses: ammaraskar/gcc-problem-matcher@master
 
-    - name: Set up JDK 8 (android)
+    - name: Set up JDK (android)
       if: runner.os == 'Linux' && matrix.android != 'none'
       uses: actions/setup-java@v4
       with:

.github/workflows/matrix.yml

@@ -18,7 +18,7 @@ jobs:
     if: >
       ${{ github.event.workflow_run.event == 'push' &&
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.status == 'success' &&
+      ( github.event.workflow_run.status == 'success' || github.event.workflow_run.status == 'completed' ) &&
       github.repository == 'CleverRaven/Cataclysm-DDA' }}
     steps:
       - name: "Install gettext tools"

.github/workflows/push-translation-template.yml

@@ -70,7 +70,6 @@ jobs:
             artifact: windows-with-graphics-x64
             arch: x64
             os: windows-2022
-            mxe: none
             ext: zip
             content: application/zip
             tiles: 1
@@ -79,14 +78,12 @@ jobs:
             artifact: windows-with-graphics-and-sounds-x64
             arch: x64
             os: windows-2022
-            mxe: none
             ext: zip
             content: application/zip
             tiles: 1
             sound: 1
           - name: Linux Tiles x64
             os: ubuntu-22.04
-            mxe: none
             android: none
             libbacktrace: 1
             tiles: 1
@@ -96,7 +93,6 @@ jobs:
             content: application/gzip
           - name: Linux Tiles Sounds x64
             os: ubuntu-22.04
-            mxe: none
             android: none
             libbacktrace: 1
             tiles: 1
@@ -106,7 +102,6 @@ jobs:
             content: application/gzip
           - name: Linux Curses x64
             os: ubuntu-22.04
-            mxe: none
             android: none
             libbacktrace: 1
             tiles: 0
@@ -116,39 +111,34 @@ jobs:
             content: application/gzip
           - name: macOS Curses Universal Binary (x64 and arm64)
             os: macos-15
-            mxe: none
             tiles: 0
             sound: 0
             artifact: osx-terminal-only-universal
             ext: dmg
             content: application/x-apple-diskimage
           - name: macOS Tiles Universal Binary (x64 and arm64)
             os: macos-15
-            mxe: none
             tiles: 1
             sound: 0
             artifact: osx-with-graphics-universal
             ext: dmg
             content: application/x-apple-diskimage
           - name: Android x64
             os: ubuntu-latest
-            mxe: none
             tiles: 1
             android: arm64
             artifact: android-x64
             ext: apk
             content: application/apk
           - name: Android x32
             os: ubuntu-latest
-            mxe: none
             tiles: 1
             android: arm32
             artifact: android-x32
             ext: apk
             content: application/apk 
           #- name: WebAssembly Bundle
           #  os: ubuntu-latest
-          #  mxe: none
           #  artifact: wasm
           #  ext: zip
           #  content: application/zip
@@ -180,12 +170,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: translations
-      - name: Install dependencies (windows msvc) (0/4)
-        if: runner.os == 'Windows'
-        uses: lukka/get-cmake@latest
-        with:
-          # 4.0.0 has issues compiling old packages in vcpkg
-          cmakeVersion: 3.31.6
       - name: Install dependencies (windows msvc) (1/4)
         if: runner.os == 'Windows'
         uses: microsoft/setup-msbuild@v2
@@ -208,22 +192,8 @@ jobs:
           install: >-
             gettext
             make
-      - name: Install dependencies (windows mxe)
-        if: matrix.mxe != 'none'
-        run: |
-          sudo apt install gettext
-      - name: Install MXE
-        if: matrix.mxe != 'none'
-        run: |
-          curl -L -o mxe-${{ matrix.mxe }}.tar.xz https://github.com/BrettDong/MXE-GCC/releases/download/mxe-sdl-2-0-20/mxe-${{ matrix.mxe }}.tar.xz
-          curl -L -o mxe-${{ matrix.mxe }}.tar.xz.sha256 https://github.com/BrettDong/MXE-GCC/releases/download/mxe-sdl-2-0-20/mxe-${{ matrix.mxe }}.tar.xz.sha256
-          shasum -a 256 -c ./mxe-${{ matrix.mxe }}.tar.xz.sha256
-          sudo tar xJf mxe-${{ matrix.mxe }}.tar.xz -C /opt
-          curl -L -o SDL2-devel-2.26.2-mingw.tar.gz https://github.com/libsdl-org/SDL/releases/download/release-2.26.2/SDL2-devel-2.26.2-mingw.tar.gz
-          shasum -a 256 -c ./build-scripts/SDL2-devel-2.26.2-mingw.tar.gz.sha256
-          sudo tar -xzf SDL2-devel-2.26.2-mingw.tar.gz -C /opt/mxe/usr/${{ matrix.mxe }}-w64-mingw32.static.gcc12 --strip-components=2 SDL2-2.26.2/${{ matrix.mxe }}-w64-mingw32
       - name: Install dependencies (Linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' && !matrix.wasm
+        if: runner.os == 'Linux' && matrix.android == 'none' && !matrix.wasm
         run: |
           sudo apt-get update
           sudo apt-get install libsdl2-dev
@@ -285,7 +255,7 @@ jobs:
           cp LICENSE ${{ github.workspace }}/LICENSE-libbacktrace.txt
           sudo make install
       - name: Build CDDA (linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' && !matrix.wasm
+        if: runner.os == 'Linux' && matrix.android == 'none' && !matrix.wasm
         run: |
           make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=${{ matrix.libbacktrace }} WARN_STALE_DATA=1 PCH=0 bindist
           mv cataclysmdda-0.J.tar.gz cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
@@ -295,13 +265,6 @@ jobs:
           ./build-scripts/build-emscripten.sh
           ./build-scripts/prepare-web.sh
           (cd build && zip ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }} *)
-      - name: Build CDDA (windows mxe)
-        if: matrix.mxe != 'none'
-        env:
-          PLATFORM: /opt/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static.gcc12-
-        run: |
-          make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 LIBBACKTRACE=${{ matrix.libbacktrace }} WARN_STALE_DATA=1 PCH=0 bindist
-          mv cataclysmdda-0.J.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (windows msvc)
         if: runner.os == 'Windows'
         env:
@@ -318,19 +281,19 @@ jobs:
         run: |
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 FRAMEWORK=1 UNIVERSAL_BINARY=1 WARN_STALE_DATA=1 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
-      - name: Set up JDK 8 (android)
-        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+      - name: Set up JDK (android)
+        if: runner.os == 'Linux' && matrix.android != 'none'
         uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'   
       - name: Setup Build and Dependencies (android)
-        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+        if: runner.os == 'Linux' && matrix.android != 'none'
         run: |
           sudo apt-get update
           sudo apt-get install gettext          
       - name: Build CDDA (android)
-        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+        if: runner.os == 'Linux' && matrix.android != 'none'
         working-directory: ./android
         run: |
           echo "${{ secrets.KEYSTORE }}" > release.keystore.asc   

.github/workflows/release.yml

@@ -14,6 +14,7 @@
 /bindist/
 /build/
 /build-start-time
+/ccache/
 /cache/
 /cmake-build-debug/
 /config/