Merge branch 'main' into construction-veh-spawns

cataclysmbnteam · Jun 7, 2024 · 2033c9c · 2033c9c
2 parents 6fca6db + de7b8a0
commit 2033c9c
Show file tree

Hide file tree

Showing 97 changed files with 2,418 additions and 1,517 deletions.
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -129,6 +129,20 @@ jobs:
             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: Android x64
             os: ubuntu-22.04
             mxe: none
@@ -224,6 +238,8 @@ jobs:
         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
+          python3 -m venv ./venv
+          source ./venv/bin/activate
           pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist
 
       - name: Build CBN (linux)
@@ -249,6 +265,7 @@ jobs:
       - name: Build CBN (osx)
         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++
           mv CataclysmBN-${{ env.VERSION }}.dmg cbn-${{ matrix.artifact }}-${{ env.VERSION }}.dmg
       - name: Set up JDK 11 (android)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -152,6 +152,20 @@ jobs:
             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: Android x64
             os: ubuntu-22.04
             mxe: none
@@ -250,6 +264,8 @@ jobs:
         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
+          python3 -m venv ./venv
+          source ./venv/bin/activate
           pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist
 
       - name: Build CBN (linux)
@@ -278,6 +294,7 @@ jobs:
       - name: Build CBN (osx)
         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++
           mv CataclysmBN-unstable.dmg cbn-${{ matrix.artifact }}-${{ needs.metadata.outputs.tag_name }}.dmg
 

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -541,7 +541,7 @@
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.15 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }
     ]
   },
   {
@@ -554,7 +554,7 @@
       { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.015 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 }
     ]
   },
   {
@@ -577,7 +577,7 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.15 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }
     ]
   },
   {
@@ -588,7 +588,7 @@
       { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
-      { "drop": "acidchitin_piece", "type": "bone", "mass_ratio": 0.15 }
+      { "drop": "acidchitin_piece", "type": "skin", "mass_ratio": 0.15 }
     ]
   },
   {
@@ -602,7 +602,7 @@
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
       { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.15 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }
     ]
   },
   {
@@ -616,7 +616,7 @@
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 },
       { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.15 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 }
     ]
   },
   {
@@ -630,7 +630,7 @@
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.01 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.03 },
       { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.15 },
       { "drop": "egg_wasp", "type": "offal", "base_num": [ 10, 30 ], "scale_num": [ 5, 5 ] }
     ]
   },
@@ -644,7 +644,7 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.005 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0045 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.025 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.015 },
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 },
       { "drop": "egg_dragonfly", "type": "offal", "base_num": [ 5, 35 ], "scale_num": [ 0.3, 0.5 ] }
     ]
   },
@@ -659,7 +659,7 @@
       { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.015 },
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.015 },
       { "drop": "egg_firefly", "type": "offal", "base_num": [ 0, 3 ] }
     ]
   },
@@ -674,7 +674,7 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.05 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.012 }
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.012 }
     ]
   },
   {
@@ -687,7 +687,7 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.05 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.012 },
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.012 },
       { "drop": "egg_centipede", "type": "offal", "base_num": [ 3, 10 ], "scale_num": [ 0.5, 1 ], "max": 30 }
     ]
   },
@@ -702,7 +702,7 @@
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.05 },
       { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
       { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.3 },
+      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.3 },
       { "drop": "egg_centipede", "type": "offal", "base_num": [ 0, 3 ], "scale_num": [ 0.5, 1 ], "max": 10 }
     ]
   },

diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
@@ -654,7 +654,7 @@
     "storage": "4 L",
     "warmth": 8,
     "material_thickness": 2,
-    "properties": [ [ "monster_size_capacity", "SMALL" ] ],
+    "properties": [ [ "creature_size_capacity", "SMALL" ] ],
     "use_action": "CAPTURE_MONSTER_ACT",
     "valid_mods": [ "resized_large" ],
     "flags": [ "BELTED", "WATERPROOF" ]

diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
@@ -210,7 +210,6 @@
     "ascii_picture": "mossberg590",
     "volume": "2548 ml",
     "looks_like": "mossberg_500",
-    "default_mods": [ "sights_mount", "underbarrel_mount" ],
     "price": "700 USD",
     "barrel_length": "0 ml",
     "clip_size": 9

diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json
@@ -81,8 +81,16 @@
     "type": "GENERIC",
     "category": "tools",
     "weapon_category": [ "KNIVES" ],
-    "name": { "str": "stone knife", "str_pl": "stone knives" },
-    "description": "This is a sharpened stone set into a hollowed handle.  Not nearly as usable as a proper knife, but it's better than nothing.",
+    "name": { "str": "primitive knife", "str_pl": "primitive knives" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "rock", "name": { "str": "stone knife", "str_pl": "stone knives" } },
+      {
+        "type": "COMPONENT_ID",
+        "condition": "ceramic",
+        "name": { "str": "ceramic knife", "str_pl": "ceramic knives" }
+      }
+    ],
+    "description": "This is a sharpened stone or shard of ceramic set into a hollowed handle.  Not nearly as usable as a proper knife, but it's better than nothing.",
     "weight": "453 g",
     "volume": "250 ml",
     "price": "0 cent",

diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json
@@ -62,8 +62,12 @@
     "type": "GENERIC",
     "category": "tools",
     "weapon_category": [ "CLUBS" ],
-    "name": { "str": "stone shovel" },
-    "description": "This is a flattened stone affixed to a stick.  It works passably well as a shovel but really can't compare to a real shovel.",
+    "name": { "str": "primitive shovel" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "rock", "name": "stone shovel" },
+      { "type": "COMPONENT_ID", "condition": "ceramic", "name": "ceramic shovel" }
+    ],
+    "description": "This is a flattened stone or ceramic shard affixed to a stick.  It works passably well as a shovel but really can't compare to a real shovel.",
     "weight": "1581 g",
     "volume": "4 L",
     "price": "0 cent",

diff --git a/data/json/items/tool/pets.json b/data/json/items/tool/pets.json
@@ -14,7 +14,7 @@
     "material": [ "steel" ],
     "symbol": "#",
     "color": "light_gray",
-    "properties": [ [ "monster_size_capacity", "TINY" ] ],
+    "properties": [ [ "creature_size_capacity", "TINY" ] ],
     "use_action": "CAPTURE_MONSTER_ACT",
     "flags": [ "TRADER_AVOID" ]
   },
@@ -104,7 +104,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "#",
     "color": "light_gray",
-    "properties": [ [ "monster_size_capacity", "SMALL" ] ],
+    "properties": [ [ "creature_size_capacity", "SMALL" ] ],
     "use_action": "CAPTURE_MONSTER_ACT",
     "flags": [ "TRADER_AVOID" ]
   },

diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
@@ -209,8 +209,12 @@
     "type": "GENERIC",
     "category": "tools",
     "weapon_category": [ "1H_HOOKED" ],
-    "name": { "str": "stone adze" },
-    "description": "This is a stone adze, somewhat useful for smoothing wood objects.",
+    "name": { "str": "primitive adze" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "rock", "name": "stone adze" },
+      { "type": "COMPONENT_ID", "condition": "ceramic", "name": "ceramic adze" }
+    ],
+    "description": "This is a stone or ceramic adze, somewhat useful for smoothing wood objects.",
     "weight": "1300 g",
     "volume": "1 L",
     "price": "10 USD",
@@ -229,7 +233,11 @@
     "type": "GENERIC",
     "category": "tools",
     "weapon_category": [ "2H_AXES" ],
-    "name": { "str": "stone axe" },
+    "name": { "str": "primtitive axe" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "rock", "name": "stone axe" },
+      { "type": "COMPONENT_ID", "condition": "ceramic", "name": "ceramic axe" }
+    ],
     "description": "This is a stone with a narrow edge affixed to a stick.  It can chop wood, but requires much more effort than a modern axe.",
     "weight": "3154 g",
     "volume": "3500 ml",
@@ -286,7 +294,12 @@
     "weapon_category": [ "1H_AXES" ],
     "symbol": ";",
     "color": "light_gray",
-    "name": { "str": "stone tomahawk" },
+    "name": { "str": "primitive tomahawk" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "rock", "name": "stone tomahawk" },
+      { "type": "COMPONENT_ID", "condition": "ceramic", "name": "ceramic tomahawk" },
+      { "type": "COMPONENT_ID", "condition": "bone", "name": "bone tomahawk" }
+    ],
     "description": "A lightweight one-handed combat hatchet typically made of stone or bone, originally used by the Algonquian people.  It makes for a half decent tool and weapon.",
     "price_postapoc": 100,
     "material": [ "wood", "stone" ],

diff --git a/data/json/items/vehicle/cargo.json b/data/json/items/vehicle/cargo.json
@@ -111,7 +111,7 @@
     "symbol": "]",
     "color": "light_gray",
     "looks_like": "cargo_rack",
-    "properties": [ [ "monster_size_capacity", "HUGE" ] ],
+    "properties": [ [ "creature_size_capacity", "HUGE" ] ],
     "use_action": "CAPTURE_MONSTER_VEH",
     "flags": [ "TRADER_AVOID" ]
   },