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

Aerin-of-the-Toast · Jul 12, 2023 · c41748c · c41748c
2 parents 6b44959 + 74e3fd1
commit c41748c
Show file tree

Hide file tree

Showing 48 changed files with 3,396 additions and 237 deletions.
diff --git a/data/json/flags.json b/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",

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/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 ],

diff --git a/data/json/itemgroups/SUS/library.json b/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 },

diff --git a/data/json/itemgroups/art_antiques_crafts.json b/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 },

diff --git a/data/json/itemgroups/books.json b/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 },

diff --git a/data/json/items/armor/brigandine.json b/data/json/items/armor/brigandine.json
@@ -27,6 +27,18 @@
         "coverage": 95,
         "encumbrance": 12
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -81,6 +93,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -138,6 +162,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -206,6 +242,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -247,6 +295,18 @@
         "coverage": 95,
         "encumbrance": 12
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -290,6 +350,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -342,6 +414,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -399,6 +483,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -440,6 +536,18 @@
         "coverage": 95,
         "encumbrance": 12
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -529,6 +637,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -586,6 +706,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -627,6 +759,18 @@
         "coverage": 95,
         "encumbrance": 12
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -722,6 +866,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -779,6 +935,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -820,6 +988,18 @@
         "coverage": 95,
         "encumbrance": 12
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -909,6 +1089,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {
@@ -963,6 +1155,18 @@
         "cover_vitals": 100,
         "encumbrance": 4
       }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3000 g",
+        "moves": 3000,
+        "description": "Attachment for additional plating placed on top.",
+        "flag_restriction": [ "EXTRA_PLATING" ]
+      }
     ]
   },
   {