Port the mod back to DDA

4 files changed, 393 insertions, 10 deletions

diff --git a/json/items/armor/modularvest.json b/json/items/armor/modularvest.json
index a4d6ead..6e16dc7 100644
--- a/json/items/armor/modularvest.json
+++ b/json/items/armor/modularvest.json
@@ -2,37 +2,326 @@
   {
     "id": "modularvest",
     "type": "ARMOR",
-    "copy-from": "modularvest",
     "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" },
-    "encumbrance": 8
+    "description": "A Modular Bullet Resistant Vest.  It has pouches for extra armor inserts, but without them provides little more protection over a regular vest.  It has four pouches capable of carrying magazines.",
+    "weight": "3000 g",
+    "volume": "6 L",
+    "price": 29900,
+    "price_postapoc": 2000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar" ],
+    "symbol": "[",
+    "looks_like": "modularvestkevlar",
+    "color": "light_gray",
+    "covers": [ "torso" ],
+    "coverage": 85,
+    "encumbrance": 8,
+    "warmth": 15,
+    "material_thickness": 5,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
+    "flags": [ "STURDY", "OUTER" ]
   },
   {
     "id": "modularvestceramic",
     "type": "ARMOR",
-    "copy-from": "modularvestceramic",
     "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
-    "encumbrance": 10
+    "description": "A Modular Bullet Resistant Vest.  Ceramic plates have been inserted to improve its protection.  The ceramic plates cannot be repaired, only replaced.  It has four pouches capable of carrying magazines.",
+    "weight": "4308 g",
+    "volume": "6 L",
+    "price": 39900,
+    "price_postapoc": 4000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar", "ceramic" ],
+    "symbol": "[",
+    "looks_like": "modularvestkevlar",
+    "color": "light_gray",
+    "covers": [ "torso" ],
+    "coverage": 85,
+    "encumbrance": 10,
+    "warmth": 15,
+    "material_thickness": 13,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
+    "flags": [ "STURDY", "OUTER" ]
   },
   {
     "id": "modularvesthard",
     "type": "ARMOR",
-    "copy-from": "modularvesthard",
     "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" },
-    "encumbrance": 20
+    "description": "A Modular Bullet Resistant Vest.  Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility.  It has four pouches capable of carrying magazines.",
+    "weight": "14860 g",
+    "volume": "6 L",
+    "price": 39900,
+    "price_postapoc": 3500,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar", "hardsteel" ],
+    "symbol": "[",
+    "looks_like": "modularvestkevlar",
+    "color": "light_cyan",
+    "covers": [ "torso" ],
+    "coverage": 85,
+    "encumbrance": 20,
+    "warmth": 15,
+    "material_thickness": 9,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
+    "flags": [ "STURDY", "OUTER" ]
   },
   {
     "id": "modularveststeel",
     "type": "ARMOR",
-    "copy-from": "modularveststeel",
     "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" },
-    "encumbrance": 20
+    "description": "A Modular Bullet Resistant Vest.  Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering.  It has four pouches capable of carrying magazines.",
+    "weight": "10860 g",
+    "volume": "6 L",
+    "price": 39900,
+    "price_postapoc": 2500,
+    "to_hit": -3,
+    "bashing": 8,
+    "material": [ "kevlar", "steel" ],
+    "symbol": "[",
+    "looks_like": "modularvestkevlar",
+    "color": "light_cyan",
+    "covers": [ "torso" ],
+    "coverage": 85,
+    "encumbrance": 20,
+    "warmth": 15,
+    "material_thickness": 12,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
+    "flags": [ "STURDY", "OUTER" ]
   },
   {
     "id": "modularvestsuper",
     "type": "ARMOR",
-    "copy-from": "modularvestsuper",
     "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" },
+    "description": "A Modular Bullet Resistant Vest.  Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight.  It has four pouches capable of carrying magazines.",
+    "weight": "6460 g",
+    "volume": "6 L",
+    "price": 80000,
+    "price_postapoc": 5000,
+    "to_hit": -3,
+    "bashing": 8,
+    "material": [ "kevlar", "superalloy" ],
+    "symbol": "[",
+    "looks_like": "modularvestkevlar",
+    "color": "light_cyan",
+    "covers": [ "torso" ],
+    "coverage": 85,
     "encumbrance": 10,
-    "material_thickness": 10
+    "warmth": 15,
+    "material_thickness": 15,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_item_length": "240 mm",
+        "min_item_volume": "250 ml",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "moves": 60,
+        "flag_restriction": [ "MAG_COMPACT" ]
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Stash ammo", "holster_msg": "You stash your %s." },
+    "flags": [ "STURDY", "OUTER" ]
   }
 ]
diff --git a/json/migration.json b/json/migration.json
index 143b01e..2fbf4c6 100644
--- a/json/migration.json
+++ b/json/migration.json
@@ -18,5 +18,20 @@
     "id": "ceramicdisks",
     "type": "MIGRATION",
     "replace": "ceramic_armor"
+  },
+  {
+    "id": "ballistic_vest_empty",
+    "type": "MIGRATION",
+    "replace": "modularvest"
+  },
+  {
+    "id": "ballistic_vest_esapi",
+    "type": "MIGRATION",
+    "replace": "modularvestceramic"
+  },
+  {
+    "id": "xlkevlar",
+    "type": "MIGRATION",
+    "replace": "modularvest"
   }
 ]
diff --git a/json/obsoletion.json b/json/obsoletion.json
index b1d759f..e5a2f9a 100644
--- a/json/obsoletion.json
+++ b/json/obsoletion.json
@@ -13,5 +13,30 @@
     "result": "dragonskin",
     "type": "recipe",
     "obsolete": true
+  },
+  {
+    "result": "xlkevlar",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "modularvestsuper",
+    "type": "recipe",
+    "obsolete": false
+  },
+  {
+    "result": "modularveststeel",
+    "type": "recipe",
+    "obsolete": false
+  },
+  {
+    "result": "modularvesthard",
+    "type": "recipe",
+    "obsolete": false
+  },
+  {
+    "result": "modularvestceramic",
+    "type": "recipe",
+    "obsolete": false
   }
 ]
diff --git a/json/recipes/modularvest.json b/json/recipes/modularvest.json
new file mode 100644
index 0000000..de1e133
--- /dev/null
+++ b/json/recipes/modularvest.json
@@ -0,0 +1,54 @@
+[
+  {
+    "result": "modularvestceramic",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "time": "5 m",
+    "reversible": true,
+    "decomp_learn": 0,
+    "autolearn": true,
+    "components": [ [ [ "modularvest", 1 ] ], [ [ "ceramic_armor", 4 ] ] ],
+    "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "result": "modularvesthard",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "time": "5 m",
+    "reversible": true,
+    "decomp_learn": 0,
+    "autolearn": true,
+    "components": [ [ [ "modularvest", 1 ] ], [ [ "hard_steel_armor", 8 ] ] ],
+    "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "result": "modularveststeel",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "time": "5 m",
+    "reversible": true,
+    "decomp_learn": 0,
+    "autolearn": true,
+    "components": [ [ [ "modularvest", 1 ] ], [ [ "steel_armor", 8 ] ] ],
+    "flags": [ "BLIND_EASY" ]
+  },
+  {
+    "result": "modularvestsuper",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "time": "5 m",
+    "reversible": true,
+    "decomp_learn": 0,
+    "autolearn": true,
+    "components": [ [ [ "modularvest", 1 ] ], [ [ "alloy_sheet", 8 ] ] ],
+    "flags": [ "BLIND_EASY" ]
+  }
+]