Merge remote-tracking branch 'upstream/master'

.github/comment-commands.yml

@@ -38,6 +38,7 @@ users:
     - pjf
     - SurFlurer
     - Procyonae
+    - harakka
 
 keywords:
   - name: confirm-bug

.gitignore

@@ -33,6 +33,7 @@
 /src/prefix.h
 /sound/
 /templates/
+/export_dir/
 /tools/format/json_formatter.cgi
 CataclysmWin.cscope_file_list
 CataclysmWin.depend

data/changelog.txt

@@ -33,6 +33,8 @@ Added enable and disable mutation EOCs
 3D vision for isometric tilesets
 Unhardcode dragging, grab fixes
 Make vehicle doors lockable and pickable
+Implement export&import of the protagonist and follower NPCs
+Expand grain farming and adjust seeds
 
 
 ## Content:
@@ -61,6 +63,7 @@ Gastropod Foot Limb: Mutant limbs can be added in json
 Added a small office building fortified by bandits
 New location: speedway
 You can now choose a new leader for your faction without dying
+Adds new skateboard vehicle
 
 
 ## Interface:
@@ -104,6 +107,7 @@ Bombastic Perks adds Playstyle Perks
 [Magiclysm] Ways to boost your caster level
 Disable the Bionic Professions mod by default
 Add the Mind Over Matter mod to the CDDA repository
+[Tamable Wildlife] More tamable creatures
 
 
 ## Balance:
@@ -125,6 +129,8 @@ player can drag heavier vehicles
 difficulty to repair depends on what the thing is made of instead of its crafting difficulty
 Hound afterimages also copy their host nicknames
 The player is substantially less effective with guns at low skill values
+Lycra is less protective
+BMI has a less all consuming impact on how healthy you are
 
 
 ## Bugfixes:
@@ -173,6 +179,11 @@ Don't allow to scan books that are owned by other characters
 Fix NPC putting items in open air when fetching items during an activity when 3D FOV is on
 Trees and other FLAMMABLE_ASH terrain leaves behind ash when burned down
 Do not report monsters breaking free of unknown grabbers if the player cannot see them
+Allows certain docks to be placed on non-flowing shallow and deep water.
+Fix the epilogue for the New England Church Community
+Flat armor penetration is spread across all armor layers instead of applying its full value to each
+Fix tow cables being unable to connect different vehicles
+Smashing now incorporates any MELEE_DAMAGE and STRENGTH enchantments
 
 
 ## Performance:
@@ -192,6 +203,7 @@ Add units::temperature_delta
 Upgrade clang-tidy used in CI to LLVM 16
 Allow C++ standard includes in clang-tidy tests
 Refactor timer items to be a bit more time based
+Support for material replacement in items
 
 
 ## Build:

data/json/bionics.json

@@ -59,10 +59,10 @@
     "description": "An advanced protective meshwork has been woven into the flesh on your arms and hands, protecting them from physical trauma.",
     "occupied_bodyparts": [ [ "arm_l", 4 ], [ "arm_r", 4 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
     "protec": [
-      [ "arm_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "arm_r", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "hand_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "hand_r", { "bash": 3, "cut": 3, "bullet": 3 } ]
+      [ "arm_l", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "arm_r", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "hand_l", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "hand_r", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ]
     ],
     "encumbrance": [ [ "arm_l", 1 ], [ "arm_r", 1 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
     "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
@@ -153,7 +153,15 @@
       "FAT",
       "SLIME_SPRAY",
       "MUCUS_SECRETION",
-      "MUCUS_SECRETION2"
+      "MUCUS_SECRETION2",
+      "SKIN_SMOOTH",
+      "SKIN_RASHY",
+      "CHITIN_MOLTED",
+      "CHITIN2_MOLTED",
+      "CHITIN3_MOLTED",
+      "CRUSTACEAN_CARAPACE_MOLTED",
+      "SPARSE_SCALES",
+      "SKIN_PEELING"
     ]
   },
   {
@@ -172,7 +180,10 @@
     "name": { "str": "Head Alloy Plating" },
     "description": "An advanced protective meshwork has been woven into the flesh on your head and jaw region, protecting your skull from physical trauma.",
     "occupied_bodyparts": [ [ "head", 3 ], [ "mouth", 1 ] ],
-    "protec": [ [ "head", { "bash": 3, "cut": 3, "bullet": 3 } ], [ "mouth", { "bash": 3, "cut": 3, "bullet": 3 } ] ],
+    "protec": [
+      [ "head", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "mouth", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ]
+    ],
     "encumbrance": [ [ "head", 1 ] ],
     "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
@@ -277,7 +288,15 @@
       "SLIME_SPRAY",
       "MUCUS_SECRETION",
       "MUCUS_SECRETION2",
-      "WIDE_MOUTH"
+      "WIDE_MOUTH",
+      "SKIN_SMOOTH",
+      "SKIN_RASHY",
+      "CHITIN_MOLTED",
+      "CHITIN2_MOLTED",
+      "CHITIN3_MOLTED",
+      "CRUSTACEAN_CARAPACE_MOLTED",
+      "SPARSE_SCALES",
+      "SKIN_PEELING"
     ]
   },
   {
@@ -287,10 +306,10 @@
     "description": "An advanced protective meshwork has been woven into the flesh on your legs and feet, protecting them from physical trauma.",
     "occupied_bodyparts": [ [ "leg_l", 6 ], [ "leg_r", 6 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
     "protec": [
-      [ "leg_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "leg_r", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "foot_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
-      [ "foot_r", { "bash": 3, "cut": 3, "bullet": 3 } ]
+      [ "leg_l", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "leg_r", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "foot_l", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ],
+      [ "foot_r", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ]
     ],
     "encumbrance": [ [ "leg_l", 1 ], [ "leg_r", 1 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
     "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
@@ -376,7 +395,15 @@
       "GASTROPOD_FOOT",
       "GASTROPOD_BALANCE",
       "MUCUS_SECRETION",
-      "MUCUS_SECRETION2"
+      "MUCUS_SECRETION2",
+      "SKIN_SMOOTH",
+      "SKIN_RASHY",
+      "CHITIN_MOLTED",
+      "CHITIN2_MOLTED",
+      "CHITIN3_MOLTED",
+      "CRUSTACEAN_CARAPACE_MOLTED",
+      "SPARSE_SCALES",
+      "SKIN_PEELING"
     ]
   },
   {
@@ -385,7 +412,7 @@
     "name": { "str": "Torso Alloy Plating" },
     "description": "An advanced protective meshwork has been woven into the flesh on your torso, protecting it from physical trauma.",
     "occupied_bodyparts": [ [ "torso", 10 ] ],
-    "protec": [ [ "torso", { "bash": 3, "cut": 3, "bullet": 3 } ] ],
+    "protec": [ [ "torso", { "bash": 3, "cut": 3, "bullet": 3, "stab": 3 } ] ],
     "encumbrance": [ [ "torso", 1 ] ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
@@ -461,7 +488,15 @@
       "SLIME_SPRAY",
       "INSECT_RESERVOIR",
       "MUCUS_SECRETION",
-      "MUCUS_SECRETION2"
+      "MUCUS_SECRETION2",
+      "SKIN_SMOOTH",
+      "SKIN_RASHY",
+      "CHITIN_MOLTED",
+      "CHITIN2_MOLTED",
+      "CHITIN3_MOLTED",
+      "CRUSTACEAN_CARAPACE_MOLTED",
+      "SPARSE_SCALES",
+      "SKIN_PEELING"
     ]
   },
   {
@@ -538,7 +573,7 @@
     "id": "bio_carbon",
     "type": "bionic",
     "name": { "str": "Subdermal Carbon Filament" },
-    "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes.  This has little impact on blunt trauma but will protect you against deep cuts.",
+    "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes.  This has no impact on blunt trauma but will protect you against deep cuts.",
     "occupied_bodyparts": [
       [ "torso", 6 ],
       [ "head", 2 ],
@@ -554,17 +589,17 @@
     ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "protec": [
-      [ "torso", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "head", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "mouth", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "arm_l", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "arm_r", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "leg_l", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "leg_r", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "foot_l", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "foot_r", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "hand_l", { "bash": 2, "cut": 4, "bullet": 4 } ],
-      [ "hand_r", { "bash": 2, "cut": 4, "bullet": 4 } ]
+      [ "torso", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "head", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "mouth", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "arm_l", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "arm_r", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "leg_l", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "leg_r", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "foot_l", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "foot_r", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "hand_l", { "cut": 4, "bullet": 4, "stab": 4 } ],
+      [ "hand_r", { "cut": 4, "bullet": 4, "stab": 4 } ]
     ]
   },
   {

data/json/body_parts.json

@@ -19,7 +19,6 @@
     "hit_difficulty": 1,
     "side": "both",
     "legacy_id": "TORSO",
-    "grabbing_effect": "grabbing_torso",
     "stylish_bonus": 6,
     "hot_morale_mod": 2,
     "cold_morale_mod": 2,
@@ -128,7 +127,6 @@
     "hit_size": 4,
     "hit_difficulty": 1.2,
     "side": "both",
-    "grabbing_effect": "grabbing_head",
     "stylish_bonus": 3,
     "hot_morale_mod": 2,
     "cold_morale_mod": 2,
@@ -221,7 +219,6 @@
     "hit_difficulty": 1.2,
     "side": "both",
     "legacy_id": "HEAD",
-    "grabbing_effect": "grabbing_head",
     "stylish_bonus": 3,
     "hot_morale_mod": 2,
     "cold_morale_mod": 2,
@@ -312,7 +309,6 @@
     "side": "both",
     "legacy_id": "EYES",
     "//": "Shouldn't happen, but consistency is nice",
-    "grabbing_effect": "grabbing_eyes",
     "stylish_bonus": 2,
     "squeamish_penalty": 8,
     "base_hp": 60,
@@ -350,7 +346,6 @@
     "limb_scores": [ [ "breathing", 1.0 ], [ "manip", 0.05, 0.2 ] ],
     "side": "both",
     "legacy_id": "MOUTH",
-    "grabbing_effect": "grabbing_mouth",
     "stylish_bonus": 2,
     "hot_morale_mod": 2,
     "cold_morale_mod": 2,
@@ -387,7 +382,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "lift", 0.5 ], [ "balance", 0.15 ], [ "block", 1.0 ], [ "swim", 0.1 ], [ "crawl", 0.3 ] ],
     "side": "left",
     "legacy_id": "ARM_L",
-    "grabbing_effect": "grabbing_arm_l",
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "fire_warmth_bonus": 600,
@@ -472,7 +466,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "lift", 0.5 ], [ "balance", 0.15 ], [ "block", 1.0 ], [ "swim", 0.1 ], [ "crawl", 0.3 ] ],
     "side": "right",
     "legacy_id": "ARM_R",
-    "grabbing_effect": "grabbing_arm_r",
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "fire_warmth_bonus": 600,
@@ -554,7 +547,6 @@
     "limb_scores": [ [ "grip", 0.5 ], [ "manip", 0.5, 1.0 ], [ "swim", 0.15 ] ],
     "side": "left",
     "legacy_id": "HAND_L",
-    "grabbing_effect": "grabbing_hand_l",
     "stylish_bonus": 0.5,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -586,7 +578,6 @@
     "limb_scores": [ [ "grip", 0.5 ], [ "manip", 0.5, 1.0 ], [ "swim", 0.15 ] ],
     "side": "right",
     "legacy_id": "HAND_R",
-    "grabbing_effect": "grabbing_hand_r",
     "stylish_bonus": 0.5,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -621,7 +612,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "move_speed", 0.5 ], [ "swim", 0.15 ], [ "block", 1 ], [ "crawl", 0.2 ] ],
     "side": "left",
     "legacy_id": "LEG_L",
-    "grabbing_effect": "grabbing_leg_l",
     "stylish_bonus": 1,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -715,7 +705,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "move_speed", 0.5 ], [ "swim", 0.15 ], [ "block", 1 ], [ "crawl", 0.2 ] ],
     "side": "right",
     "legacy_id": "LEG_R",
-    "grabbing_effect": "grabbing_leg_r",
     "stylish_bonus": 1,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -807,7 +796,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "footing", 0.5 ], [ "swim", 0.1 ] ],
     "side": "left",
     "legacy_id": "FOOT_L",
-    "grabbing_effect": "grabbing_foot_l",
     "stylish_bonus": 0.5,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -841,7 +829,6 @@
     "limb_scores": [ [ "manip", 0.1, 0.2 ], [ "footing", 0.5 ], [ "swim", 0.1 ] ],
     "side": "right",
     "legacy_id": "FOOT_R",
-    "grabbing_effect": "grabbing_foot_r",
     "stylish_bonus": 0.5,
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
@@ -878,7 +865,6 @@
     "accusative": { "ctxt": "bodypart_accusative", "str": "debug tail" },
     "hp_bar_ui_text": "DBG TAIL",
     "base_hp": 20,
-    "grabbing_effect": "grabbing_tail",
     "flags": [ "ALWAYS_BLOCK", "NONSTANDARD_BLOCK", "MEND_LIMB", "WALL_CLING" ],
     "armor": { "bash": 10 },
     "unarmed_damage": [ { "damage_type": "acid", "amount": 10 }, { "damage_type": "bullet", "amount": 5, "armor_penetration": 100 } ],

data/json/construction.json

@@ -8134,6 +8134,19 @@
     "pre_terrain": "t_dirt",
     "post_terrain": "t_rockyobstacle"
   },
+  {
+    "type": "construction",
+    "id": "constr_stooking_spot",
+    "group": "make_stooking_spot",
+    "category": "OTHER",
+    "required_skills": [ [ "survival", 2 ] ],
+    "time": "0 m",
+    "pre_note": "Mark a spot to stack cut grain for drying outdoors.  Once placed, put unrotten undried grain stalks on the stooking spot and examine it to get started.",
+    "pre_special": "check_empty",
+    "post_flags": [ "keep_items" ],
+    "dark_craftable": true,
+    "post_terrain": "f_stook_empty"
+  },
   {
     "type": "construction",
     "id": "constr_brick_oven_prep",

data/json/construction_group.json

@@ -1059,6 +1059,11 @@
     "id": "make_crafting_spot",
     "name": "Make crafting spot"
   },
+  {
+    "type": "construction_group",
+    "id": "make_stooking_spot",
+    "name": "Make stooking spot"
+  },
   {
     "type": "construction_group",
     "id": "make_gravel_floor",