Merge branch 'cataclysmbnteam:main' into implement_global_unique

.github/workflows/manual-release.yml

@@ -237,10 +237,10 @@ jobs:
       - name: Install dependencies (mac)
         if: runner.os == 'macOS'
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel llvm astyle
           python3 -m venv ./venv
           source ./venv/bin/activate
-          pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist
+          pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist polib luaparser
 
       - name: Build CBN (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
@@ -266,7 +266,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           source ./venv/bin/activate
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} LUA=1 RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 dmgdist COMPILER=clang++
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} LUA=1 RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 COMPILER=$(brew --prefix llvm)/bin/clang++ dmgdist
           mv CataclysmBN-${{ env.VERSION }}.dmg cbn-${{ matrix.artifact }}-${{ env.VERSION }}.dmg
       - name: Set up JDK 11 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'

.github/workflows/osx.yml

@@ -0,0 +1,96 @@
+name: "Cataclysm OSX Manual Build"
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - "build-data/osx/**"
+      - "doc/**"
+      - "doxygen_doc/**"
+      - "gfx/**"
+      - "lang/**"
+      - "lgtm/**"
+      - "tools/**"
+      - "!tools/format/**"
+      - "utilities/**"
+      - 'scripts/**'
+
+# We only care about the latest revision of a PR, so cancel previous instances.
+concurrency:
+  group: osx-build-${{ github.event.pull_request.number || github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  build_catatclysm:
+    if: github.event.pull_request.draft == false
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: osx-curses-x64
+            os: macos-14
+            mxe: none
+            tiles: 0
+            artifact: osx-curses-x64
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: osx-tiles-x64
+            os: macos-14
+            mxe: none
+            tiles: 1
+            artifact: osx-tiles-x64
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: osx-curses-arm
+            os: macos-14
+            mxe: none
+            tiles: 0
+            artifact: osx-curses-arm
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: osx-tiles-arm
+            os: macos-14
+            mxe: none
+            tiles: 1
+            artifact: osx-tiles-arm
+            ext: dmg
+            content: application/x-apple-diskimage
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      ZSTD_CLEVEL: 17
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Install runtime dependencies
+        uses: BrettDong/setup-sdl2-frameworks@v1
+        with:
+          sdl2: latest
+          sdl2-ttf: latest
+          sdl2-image: latest
+          sdl2-mixer: latest
+
+      - name: Install build dependencies
+        run: |
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel llvm astyle
+          python3 -m venv ./venv
+          source ./venv/bin/activate
+          pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist polib luaparser
+
+      - name: Check Clang OK
+        run: |
+          echo "Clang++ version:"
+          $(brew --prefix llvm)/bin/clang++ --version  # Ensure clang++ is installed and working
+
+      - name: Build
+        run: |
+          source ./venv/bin/activate
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} LUA=1 RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=11 PCH=0 COMPILER=$(brew --prefix llvm)/bin/clang++ dmgdist

.github/workflows/release.yml

@@ -276,10 +276,10 @@ jobs:
       - name: Install build dependencies (mac)
         if: runner.os == 'macOS'
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel llvm astyle
           python3 -m venv ./venv
           source ./venv/bin/activate
-          pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist
+          pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist polib luaparser
 
       - name: Build CBN (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
@@ -308,7 +308,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           source ./venv/bin/activate
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LUA=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=11 FRAMEWORK=1 dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LUA=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=11 FRAMEWORK=1 COMPILER=$(brew --prefix llvm)/bin/clang++ dmgdist
           mv CataclysmBN-unstable.dmg cbn-${{ matrix.artifact }}-${{ needs.metadata.outputs.tag_name }}.dmg
 
       - name: Set up JDK 11 (android)

data/json/body_parts.json

@@ -7,7 +7,8 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "appendix" },
     "heading": "appendix",
     "heading_multiple": "Appendices",
-    "encumbrance_text": "It's inflamed."
+    "encumbrance_text": "It's inflamed.",
+    "sort_order": -1000
   },
   {
     "id": "torso",
@@ -18,6 +19,7 @@
     "heading": "Torso",
     "hp_bar_ui_text": "TORSO",
     "encumbrance_text": "Dodging and melee is hampered.",
+    "sort_order": 100,
     "essential": true,
     "hit_size": 45,
     "hit_size_relative": [ 20, 33.33, 36.57 ],
@@ -37,6 +39,7 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "head" },
     "heading": "Head",
     "hp_bar_ui_text": "HEAD",
+    "sort_order": 0,
     "essential": true,
     "hit_size": 6,
     "hit_size_relative": [ 0, 2.33, 5.71 ],
@@ -56,6 +59,7 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "eyes" },
     "heading": "Eyes",
     "encumbrance_text": "Ranged combat is hampered.",
+    "sort_order": 10,
     "main_part": "head",
     "hit_size": 1,
     "hit_size_relative": [ 0, 0.33, 0.57 ],
@@ -73,6 +77,7 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "mouth" },
     "heading": "Mouth",
     "encumbrance_text": "Stamina regeneration is slowed.",
+    "sort_order": 20,
     "main_part": "head",
     "hit_size": 1,
     "hit_difficulty": 1.15,
@@ -94,6 +99,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "arms" },
     "heading": "L. Arm",
     "heading_multiple": "Arms",
+    "sort_order": 200,
     "encumbrance_text": "Melee and ranged combat is hampered.",
     "hp_bar_ui_text": "L ARM",
     "opposite_part": "arm_r",
@@ -117,6 +123,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "arms" },
     "heading": "R. Arm",
     "heading_multiple": "Arms",
+    "sort_order": 300,
     "hp_bar_ui_text": "R ARM",
     "encumbrance_text": "Melee and ranged combat is hampered.",
     "opposite_part": "arm_l",
@@ -140,6 +147,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "hands" },
     "heading": "L. Hand",
     "heading_multiple": "Hands",
+    "sort_order": 250,
     "encumbrance_text": "Manual tasks are slowed.",
     "main_part": "arm_l",
     "opposite_part": "hand_r",
@@ -163,6 +171,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "hands" },
     "heading": "R. Hand",
     "heading_multiple": "Hands",
+    "sort_order": 350,
     "encumbrance_text": "Manual tasks are slowed.",
     "main_part": "arm_r",
     "opposite_part": "hand_l",
@@ -187,6 +196,7 @@
     "heading": "L. Leg",
     "heading_multiple": "Legs",
     "hp_bar_ui_text": "L LEG",
+    "sort_order": 500,
     "encumbrance_text": "Running and swimming are slowed.",
     "opposite_part": "leg_r",
     "hit_size": 9,
@@ -211,6 +221,7 @@
     "heading": "R. Leg",
     "heading_multiple": "Legs",
     "hp_bar_ui_text": "R LEG",
+    "sort_order": 600,
     "encumbrance_text": "Running and swimming are slowed.",
     "opposite_part": "leg_l",
     "hit_size": 9,
@@ -234,6 +245,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "feet" },
     "heading": "L. Foot",
     "heading_multiple": "Feet",
+    "sort_order": 550,
     "encumbrance_text": "Running is slowed.",
     "main_part": "leg_l",
     "opposite_part": "foot_r",
@@ -257,6 +269,7 @@
     "accusative_multiple": { "ctxt": "bodypart_accusative", "str": "feet" },
     "heading": "R. Foot",
     "heading_multiple": "Feet",
+    "sort_order": 650,
     "encumbrance_text": "Running is slowed.",
     "main_part": "leg_r",
     "opposite_part": "foot_l",

data/json/construction.json

@@ -3577,7 +3577,6 @@
     "qualities": [ { "id": "DIG", "level": 1 } ],
     "components": [ [ [ "rock", 20 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
-    "pre_terrain": "t_dirt",
     "dark_craftable": true,
     "post_furniture": "f_firering"
   },