Initial commit

7 files changed, 333 insertions, 0 deletions

diff --git a/json/items/armor/modularvest.json b/json/items/armor/modularvest.json
new file mode 100644
index 0000000..55d7ca8
--- /dev/null
+++ b/json/items/armor/modularvest.json
@@ -0,0 +1,172 @@
+[
+  {
+    "id": "modularvest",
+    "type": "ARMOR",
+    "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" ]
+  },
+  {
+    "id": "modularvestceramic",
+    "type": "ARMOR",
+    "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" ]
+  },
+  {
+    "id": "modularvesthard",
+    "type": "ARMOR",
+    "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" ]
+  },
+  {
+    "id": "modularveststeel",
+    "type": "ARMOR",
+    "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" ]
+  },
+  {
+    "id": "modularvestsuper",
+    "type": "ARMOR",
+    "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" ]
+  }
+]
diff --git a/json/migration.json b/json/migration.json
new file mode 100644
index 0000000..5504b7a
--- /dev/null
+++ b/json/migration.json
@@ -0,0 +1,42 @@
+[
+  {
+    "id": "modularvestkevlar",
+    "type": "MIGRATION",
+    "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"
+  },
+  {
+    "id": "dragonskinempty",
+    "type": "MIGRATION",
+    "replace": "modularvest"
+  },
+  {
+    "id": "ceramicdisks",
+    "type": "MIGRATION",
+    "replace": "ceramic_armor"
+  }
+]
diff --git a/json/obsoletion.json b/json/obsoletion.json
new file mode 100644
index 0000000..b1d759f
--- /dev/null
+++ b/json/obsoletion.json
@@ -0,0 +1,17 @@
+[
+  {
+    "result": "modularvestkevlar",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "ballistic_vest_esapi",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "dragonskin",
+    "type": "recipe",
+    "obsolete": true
+  }
+]
diff --git a/json/recipes/armor/torso.json b/json/recipes/armor/torso.json
new file mode 100644
index 0000000..9171f69
--- /dev/null
+++ b/json/recipes/armor/torso.json
@@ -0,0 +1,68 @@
+[
+  {
+    "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" ]
+  }
+]
diff --git a/json/recipes/recipe_vehicle.json b/json/recipes/recipe_vehicle.json
new file mode 100644
index 0000000..a0fada0
--- /dev/null
+++ b/json/recipes/recipe_vehicle.json
@@ -0,0 +1,17 @@
+[
+  {
+    "type": "recipe",
+    "result": "hard_steel_armor",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "//": "hardened metal tools require high fabrication, so +1 diff here",
+    "time": "12 m",
+    "reversible": true,
+    "book_learn": [ [ "textbook_fabrication", 5 ], [ "adv_chemistry", 6 ], [ "welding_book", 5 ] ],
+    "qualities": [ { "id": "GLARE", "level": 2 } ],
+    "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "forge", 50 ], [ "oxy_torch", 10 ] ] ],
+    "components": [ [ [ "steel_lump", 12 ] ] ]
+  }
+]
diff --git a/modinfo.json b/modinfo.json
new file mode 100644
index 0000000..3340e2d
--- /dev/null
+++ b/modinfo.json
@@ -0,0 +1,11 @@
+[
+  {
+    "type": "MOD_INFO",
+    "ident": "mbr_vests_return",
+    "name": "MBR Vests Return",
+    "authors": ["jc_gargma"],
+    "description": "Restore MBR Vests to the game, and remove the ESAPI and dragon vests.",
+    "category": "rebalance",
+    "dependencies": [ "dda" ]
+  }
+]
diff --git a/readme b/readme
new file mode 100644
index 0000000..7b6ccc1
--- /dev/null
+++ b/readme
@@ -0,0 +1,6 @@
+Restore the MBR Vests and their recipes ala Bright Nights
+Migrate Filled/Empty ESAPI and Dragon Vests to Ceramic/Empty MBR vests.
+Migrate MBR Vests with Kevlar plates to the MBR Vest Empty.
+Add recipe to craft Hard Steel Plates to the same books as Hard Steel Plating.
+-It was previously possible to craft Steel Plating and Steel Plates, but only Hard Steel Plating from a book.
+-Steel Plates require half the materials of Steel Plating. Hard Steel Plates thus require half the materials of Hard Steel Plating.