Merge remote-tracking branch 'upstream/master'

.clang-tidy

@@ -77,7 +77,6 @@ readability-*,\
 -modernize-return-braced-init-list,\
 -modernize-use-default-member-init,\
 -modernize-use-nodiscard,\
--performance-unnecessary-copy-initialization,\
 -readability-container-data-pointer,\
 -readability-convert-member-functions-to-static,\
 -readability-duplicate-include,\

data/json/bionics.json

@@ -1116,6 +1116,7 @@
     "type": "bionic",
     "name": { "str": "Cerebral Booster" },
     "description": "Your brain has been enhanced with bionic coprocessors, giving you a +2 bonus to intelligence.",
+    "cant_remove_reason": "The bionic is now critical to the continued functionality of the user's brain.",
     "occupied_bodyparts": [ [ "head", 6 ] ],
     "stat_bonus": [ [ "INT", 2 ] ],
     "flags": [ "BIONIC_NPC_USABLE" ]
@@ -1207,6 +1208,7 @@
     "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you forget skills you've learned slower.",
     "occupied_bodyparts": [ [ "head", 3 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
+    "cant_remove_reason": "Removing this CBM would cause severe amnesia and neurological issues.",
     "active_flags": [ "CBQ_LEARN_BONUS" ],
     "act_cost": "2 J",
     "react_cost": "2 J",

data/json/construction.json

@@ -2517,6 +2517,23 @@
     "pre_special": "check_empty",
     "post_terrain": "f_fvat_empty"
   },
+  {
+    "type": "construction",
+    "id": "constr_fvat_wood_empty",
+    "group": "build_wooden_fermenting_vat",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 2 ], [ "cooking", 3 ] ],
+    "time": "180 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "CHISEL_WOOD", "level": 1 } ] ],
+    "components": [
+      [ [ "2x4", 14 ] ],
+      [ [ "stick_long", 6 ] ],
+      [ [ "rope_makeshift_30", 1 ], [ "rope_makeshift_6", 5 ], [ "cordage_36", 30 ], [ "cordage_6", 180 ] ],
+      [ [ "splinter", 2 ] ]
+    ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_fvat_wood_empty"
+  },
   {
     "type": "construction",
     "id": "constr_wood_keg",

data/json/construction_group.json

@@ -304,6 +304,11 @@
     "id": "build_fermenting_vat",
     "name": "Build Fermenting Vat"
   },
+  {
+    "type": "construction_group",
+    "id": "build_wooden_fermenting_vat",
+    "name": "Build Wooden Fermenting Vat"
+  },
   {
     "type": "construction_group",
     "id": "build_fire_ring",

data/json/flags.json

@@ -191,6 +191,11 @@
     "info": "This item has a <good>diamond coating</good> improving its <info>cutting or piercing damage</info>.",
     "inherit": false
   },
+  {
+    "id": "GEMSTONE",
+    "type": "json_flag",
+    "info": "This item is a precious gemstone, used for ornamentation.  This is mostly useless post-Cataclysm."
+  },
   {
     "id": "DIG_TOOL",
     "type": "json_flag",
@@ -370,6 +375,12 @@
     "info": "This item is attachable to metal cap helmets as a face and neck protective layer.",
     "restriction": "Item must be some kind of chainmail veil"
   },
+  {
+    "id": "EXTRA_PLATING",
+    "type": "json_flag",
+    "info": "This item is wearable over some armors as an extra layer of plating.",
+    "restriction": "Item must be some kind of strapped additional plating"
+  },
   {
     "id": "COLD_IMMUNE",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-tools.json

@@ -1254,6 +1254,60 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_fvat_wood_empty",
+    "name": "wooden fermenting vat",
+    "looks_like": "f_fvat_empty",
+    "description": "A sealable 50-liter wooden vat for fermenting vinegar and various alcoholic brews.",
+    "symbol": "O",
+    "color": "brown",
+    "move_cost_mod": -1,
+    "required_str": -1,
+    "flags": [ "NOITEM", "SEALED", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "fvat_empty",
+    "deconstruct": {
+      "items": [ { "item": "2x4", "count": 14 }, { "item": "cordage_6", "count": [ 150, 180 ] }, { "item": "splinter", "count": 2 } ]
+    },
+    "bash": {
+      "str_min": 3,
+      "str_max": 45,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 4, 8 ] },
+        { "item": "cordage_6", "count": [ 80, 120 ] },
+        { "item": "splinter", "count": 2 }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_fvat_wood_full",
+    "name": "filled wooden fermenting vat",
+    "looks_like": "f_fvat_wood_empty",
+    "description": "A sealable 50-liter wooden vat for fermenting vinegar and various alcoholic brews.",
+    "symbol": "O",
+    "color": "brown_cyan",
+    "move_cost_mod": -1,
+    "required_str": -1,
+    "flags": [ "NOITEM", "SEALED", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "DONT_REMOVE_ROTTEN" ],
+    "examine_action": "fvat_full",
+    "deconstruct": {
+      "items": [ { "item": "2x4", "count": 14 }, { "item": "cordage_6", "count": [ 150, 180 ] }, { "item": "splinter", "count": 2 } ]
+    },
+    "bash": {
+      "str_min": 12,
+      "str_max": 50,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 4, 8 ] },
+        { "item": "cordage_6", "count": [ 80, 120 ] },
+        { "item": "splinter", "count": 2 }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_butcher_rack",

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -307,6 +307,7 @@
       { "item": "soldering_iron", "prob": 70, "charges": [ 0, 50 ] },
       [ "solder_wire", 70 ],
       [ "textbook_weapwest", 2 ],
+      [ "textbook_weparabic", 5 ],
       [ "textbook_weapeast", 2 ],
       [ "textbook_armwest", 2 ],
       [ "textbook_armeast", 2 ],

data/json/itemgroups/SUS/library.json

@@ -112,6 +112,7 @@
       { "item": "textbook_armschina", "count": [ 1, 2 ], "prob": 50 },
       { "item": "textbook_weapeast", "count": [ 1, 2 ], "prob": 60 },
       { "item": "textbook_weapwest", "count": [ 1, 4 ], "prob": 80 },
+      { "item": "textbook_weparabic", "count": [ 1, 2 ], "prob": 60 },
       { "item": "recipe_arrows", "count": [ 1, 3 ], "prob": 60 },
       { "item": "recipe_bows", "count": [ 1, 3 ], "prob": 80 }
     ]
@@ -129,6 +130,7 @@
       { "item": "textbook_armschina", "count": [ 0, 1 ], "prob": 25 },
       { "item": "textbook_weapeast", "count": [ 0, 1 ], "prob": 20 },
       { "item": "textbook_weapwest", "count": [ 0, 2 ], "prob": 30 },
+      { "item": "textbook_weparabic", "count": [ 0, 1 ], "prob": 20 },
       { "item": "recipe_arrows", "count": [ 0, 1 ], "prob": 30 },
       { "item": "book_ruined", "count": [ 0, 12 ], "prob": 100 },
       { "item": "book_pieces", "count": [ 0, 26 ], "prob": 100 },

data/json/itemgroups/art_antiques_crafts.json

@@ -111,6 +111,7 @@
       { "item": "chainmail_hands", "prob": 3 },
       { "item": "legguard_metal", "prob": 1 },
       { "item": "textbook_weapwest", "prob": 5 },
+      { "item": "textbook_weparabic", "prob": 5 },
       { "item": "textbook_weapeast", "prob": 5 },
       { "item": "textbook_armwest", "prob": 5 },
       { "item": "textbook_armeast", "prob": 5 },

data/json/itemgroups/books.json

@@ -484,6 +484,7 @@
       { "item": "textbook_fireman", "prob": 10 },
       { "item": "textbook_armschina", "prob": 3 },
       { "item": "textbook_weapwest", "prob": 3 },
+      { "item": "textbook_weparabic", "prob": 3 },
       { "item": "textbook_weapeast", "prob": 3 },
       { "item": "textbook_armwest", "prob": 3 },
       { "item": "textbook_armeast", "prob": 3 },
@@ -583,6 +584,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "textbook_weapwest", "prob": 15 },
+      { "item": "textbook_weparabic", "prob": 15 },
       { "item": "textbook_weapeast", "prob": 15 },
       { "item": "textbook_armwest", "prob": 15 },
       { "item": "textbook_armeast", "prob": 15 },