Port to bright nights

3 files changed, 10 insertions, 232 deletions

diff --git a/json/items/armor/modularvest.json b/json/items/armor/modularvest.json
index 55d7ca8..e5e119e 100644
--- a/json/items/armor/modularvest.json
+++ b/json/items/armor/modularvest.json
@@ -2,171 +2,37 @@
   {
     "id": "modularvest",
     "type": "ARMOR",
+    "copy-from": "modularvest",
     "category": "armor",
-    "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" },
-    "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": 100000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 8,
-    "storage": "2500 ml",
-    "warmth": 15,
-    "material_thickness": 5,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
+    "encumbrance": 8
   },
   {
     "id": "modularvestceramic",
     "type": "ARMOR",
+    "copy-from": "modularvestceramic",
     "category": "armor",
-    "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
-    "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": 120000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar", "ceramic" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 10,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 9,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
+    "encumbrance": 10
   },
   {
     "id": "modularvesthard",
     "type": "ARMOR",
+    "copy-from": "modularvesthard",
     "category": "armor",
-    "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" },
-    "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": 120000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar", "hardsteel" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 20,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 5,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
+    "encumbrance": 20
   },
   {
     "id": "modularveststeel",
     "type": "ARMOR",
+    "copy-from": "modularveststeel",
     "category": "armor",
-    "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" },
-    "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": 120000,
-    "to_hit": -3,
-    "bashing": 8,
-    "material": [ "kevlar", "steel" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
-    "encumbrance": 15,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 7,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
+    "encumbrance": 20
   },
   {
     "id": "modularvestsuper",
     "type": "ARMOR",
+    "copy-from": "modularvestsuper",
     "category": "armor",
-    "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": 180000,
-    "to_hit": -3,
-    "bashing": 8,
-    "material": [ "kevlar", "superalloy" ],
-    "symbol": "[",
-    "looks_like": "modularvestkevlar",
-    "color": "light_cyan",
-    "covers": [ "TORSO" ],
-    "coverage": 85,
     "encumbrance": 10,
-    "storage": "1 L",
-    "warmth": 15,
-    "material_thickness": 10,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Stash ammo",
-      "holster_msg": "You stash your %s.",
-      "multi": 4,
-      "min_volume": "250 ml",
-      "max_volume": "1 L",
-      "draw_cost": 60,
-      "flags": [ "MAG_COMPACT" ]
-    },
-    "flags": [ "STURDY", "OUTER" ]
+    "material_thickness": 10
   }
 ]
diff --git a/json/migration.json b/json/migration.json
index 5504b7a..143b01e 100644
--- a/json/migration.json
+++ b/json/migration.json
@@ -5,26 +5,6 @@
     "replace": "modularvest"
   },
   {
-    "id": "ballistic_vest_esapi",
-    "type": "MIGRATION",
-    "replace": "modularvestceramic"
-  },
-  {
-    "id": "ballistic_vest_empty",
-    "type": "MIGRATION",
-    "replace": "modularvest"
-  },
-  {
-    "id": "esapi_plate",
-    "type": "MIGRATION",
-    "replace": "ceramic_armor"
-  },
-  {
-    "id": "esbi_plate",
-    "type": "MIGRATION",
-    "replace": "ceramic_armor"
-  },
-  {
     "id": "dragonskin",
     "type": "MIGRATION",
     "replace": "modularvestceramic"
diff --git a/json/recipes/armor/torso.json b/json/recipes/armor/torso.json
deleted file mode 100644
index 9171f69..0000000
--- a/json/recipes/armor/torso.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-  {
-    "result": "modularvest",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
-    "skill_used": "tailor",
-    "difficulty": 4,
-    "time": "30 m",
-    "reversible": true,
-    "decomp_learn": 4,
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 30 ] ],
-    "components": [ [ [ "kevlar_plate", 24 ] ] ]
-  },
-  {
-    "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" ]
-  }
-]