Obsolete and migrate xl items.

5 files changed, 33 insertions, 263 deletions

diff --git a/json/items/armor/helmet.json b/json/items/armor/helmet.json
index 4daef9c..6d810a8 100644
--- a/json/items/armor/helmet.json
+++ b/json/items/armor/helmet.json
@@ -50,31 +50,6 @@
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
   },
   {
-    "id": "helmet_xlsurvivor",
-    "type": "ARMOR",
-    "name": { "str": "XL survivor helmet" },
-    "//": "Double the weight of a survivor helm for the same protection.",
-    "description": "A massive customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
-    "weight": "2840 g",
-    "volume": "6 L",
-    "price": "0 cent",
-    "price_postapoc": "60 USD",
-    "to_hit": -1,
-    "bashing": 10,
-    "material": [ "kevlar_rigid", "leather" ],
-    "symbol": "[",
-    "looks_like": "helmet_army",
-    "color": "dark_gray",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 50,
-    "warmth": 15,
-    "material_thickness": 9,
-    "environmental_protection": 3,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
     "id": "helmet_hsurvivor",
     "type": "ARMOR",
     "name": { "str": "heavy survivor helmet" },
@@ -122,55 +97,5 @@
     "environmental_protection": 5,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
-    "id": "helmet_xlhsurvivor",
-    "type": "ARMOR",
-    "name": { "str": "XL heavy survivor helmet" },
-    "//": "Double the weight of a heavy survivor helm for the same protection.",
-    "description": "A massive customized, heavily armored steel and Kevlar helmet, modified to provide maximum comfort and protection from harm.  All the added material has made it rather heavy.",
-    "weight": "6624 g",
-    "volume": "6 L",
-    "price": "0 cent",
-    "price_postapoc": "80 USD",
-    "to_hit": -1,
-    "bashing": 10,
-    "material": [ "kevlar_rigid", "steel" ],
-    "symbol": "[",
-    "looks_like": "helmet_xlsurvivor",
-    "color": "dark_gray",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 80,
-    "warmth": 15,
-    "material_thickness": 8,
-    "environmental_protection": 5,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
-  {
-    "id": "helmet_xlsasurvivor",
-    "type": "ARMOR",
-    "name": { "str": "XL superalloy survivor helmet" },
-    "//": "Double the weight of a superalloy survivor helm for the same protection.",
-    "description": "A massive customized, heavily armored superalloy and Kevlar helmet, modified to provide maximum comfort and protection from harm.  All the added material has made it rather heavy.",
-    "weight": "5299 g",
-    "volume": "6 L",
-    "price": "0 cent",
-    "price_postapoc": "80 USD",
-    "to_hit": -1,
-    "bashing": 10,
-    "material": [ "kevlar_rigid", "superalloy" ],
-    "symbol": "[",
-    "looks_like": "helmet_xlsurvivor",
-    "color": "light_cyan",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 80,
-    "warmth": 15,
-    "material_thickness": 8,
-    "environmental_protection": 5,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
   }
 ]
diff --git a/json/items/armor/hoods.json b/json/items/armor/hoods.json
index a0f7ee7..c5e5aa5 100644
--- a/json/items/armor/hoods.json
+++ b/json/items/armor/hoods.json
@@ -47,30 +47,6 @@
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]
   },
   {
-    "id": "hood_xlsurvivor",
-    "type": "ARMOR",
-    "name": { "str": "XL survivor hood" },
-    "description": "A massive customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.",
-    "weight": "1640 g",
-    "volume": "4500 ml",
-    "price": "0 cent",
-    "price_postapoc": "25 USD",
-    "to_hit": -1,
-    "bashing": 10,
-    "material": [ "kevlar", "leather" ],
-    "symbol": "[",
-    "looks_like": "hood_survivor",
-    "color": "brown",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 40,
-    "warmth": 15,
-    "material_thickness": 4,
-    "environmental_protection": 3,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]
-  },
-  {
     "id": "hood_hsurvivor",
     "type": "ARMOR",
     "name": { "str": "heavy survivor hood" },
@@ -93,29 +69,5 @@
     "environmental_protection": 3,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]
-  },
-  {
-    "id": "hood_xlhsurvivor",
-    "type": "ARMOR",
-    "name": { "str": "XL heavy survivor hood" },
-    "description": "A massive customized, heavily armored steel and Kevlar hood, designed to provide comfort and protection from harm.",
-    "weight": "2200 g",
-    "volume": "6 L",
-    "price": "0 cent",
-    "price_postapoc": "25 USD",
-    "to_hit": -1,
-    "bashing": 10,
-    "material": [ "kevlar", "steel" ],
-    "symbol": "[",
-    "looks_like": "hood_survivor",
-    "color": "brown",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 40,
-    "warmth": 15,
-    "material_thickness": 6,
-    "environmental_protection": 3,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]
   }
 ]
diff --git a/json/items/armor/obsoletion.json b/json/items/armor/obsoletion.json
new file mode 100644
index 0000000..58e668f
--- /dev/null
+++ b/json/items/armor/obsoletion.json
@@ -0,0 +1,20 @@
+[
+  {
+    "id": "helmet_xlsasurvivor",
+    "type": "MIGRATION",
+    "replace": "helmet_sasurvivor",
+    "flags": [ "resized_large" ]
+  },
+  {
+    "id": "hood_xlhsurvivor",
+    "type": "MIGRATION",
+    "replace": "hood_hsurvivor",
+    "flags": [ "resized_large" ]
+  },
+  {
+    "id": "helmet_xlhsurvivor",
+    "type": "MIGRATION",
+    "replace": "helmet_hsurvivor",
+    "flags": [ "resized_large" ]
+  }
+]
diff --git a/json/recipes/armor/head.json b/json/recipes/armor/head.json
index 187162d..6704428 100644
--- a/json/recipes/armor/head.json
+++ b/json/recipes/armor/head.json
@@ -64,38 +64,6 @@
     ]
   },
   {
-    "result": "helmet_xlsurvivor",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 4 ],
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 20 ] ],
-    "tools": [ [ [ "welder", 84 ], [ "welder_crude", 126 ], [ "soldering_iron", 126 ], [ "toolset", 126 ] ] ],
-    "components": [
-      [ [ "helmet_liner", 2 ], [ "hat_cotton", 2 ], [ "rag", 8 ] ],
-      [ [ "tac_helmet", 2 ], [ "tac_fullhelmet", 2 ], [ "helmet_army", 2 ], [ "kevlar_plate", 14 ] ],
-      [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ],
-      [ [ "fabric_hides_proper", 18, "LIST" ] ],
-      [ [ "duct_tape", 300 ] ],
-      [
-        [ "helmet_riot", 2 ],
-        [ "helmet_motor", 2 ],
-        [ "helmet_football", 2 ],
-        [ "helmet_ball", 2 ],
-        [ "helmet_skid", 2 ],
-        [ "helmet_bike", 2 ],
-        [ "hat_hard", 2 ],
-        [ "firehelmet", 2 ],
-        [ "pickelhaube", 2 ],
-        [ "plastic_chunk", 18 ]
-      ]
-    ]
-  },
-  {
     "result": "helmet_hsurvivor",
     "type": "recipe",
     "category": "CC_ARMOR",
@@ -128,90 +96,6 @@
     ]
   },
   {
-    "result": "helmet_xlhsurvivor",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 7,
-    "skills_required": [ "fabrication", 5 ],
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 10 ] ],
-    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
-    "components": [
-      [ [ "helmet_liner", 2 ], [ "hat_cotton", 2 ], [ "rag", 8 ] ],
-      [ [ "helmet_army", 2 ] ],
-      [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ],
-      [ [ "steel_chunk", 5 ], [ "scrap", 14 ] ],
-      [ [ "duct_tape", 150 ] ],
-      [
-        [ "helmet_riot", 2 ],
-        [ "helmet_motor", 2 ],
-        [ "helmet_football", 2 ],
-        [ "helmet_ball", 2 ],
-        [ "helmet_skid", 2 ],
-        [ "helmet_bike", 2 ],
-        [ "hat_hard", 2 ],
-        [ "firehelmet", 2 ],
-        [ "pickelhaube", 2 ],
-        [ "plastic_chunk", 18 ]
-      ]
-    ]
-  },
-  {
-    "result": "helmet_xlsasurvivor",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 7,
-    "skills_required": [ "fabrication", 5 ],
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 10 ] ],
-    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
-    "components": [
-      [ [ "helmet_liner", 2 ], [ "hat_cotton", 2 ], [ "rag", 8 ] ],
-      [ [ "helmet_army", 2 ] ],
-      [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ],
-      [ [ "alloy_sheet", 8 ] ],
-      [ [ "duct_tape", 150 ] ],
-      [
-        [ "helmet_riot", 2 ],
-        [ "helmet_motor", 2 ],
-        [ "helmet_football", 2 ],
-        [ "helmet_ball", 2 ],
-        [ "helmet_skid", 2 ],
-        [ "helmet_bike", 2 ],
-        [ "hat_hard", 2 ],
-        [ "firehelmet", 2 ],
-        [ "pickelhaube", 2 ],
-        [ "plastic_chunk", 18 ]
-      ]
-    ]
-  },
-  {
-    "result": "hood_xlsurvivor",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 4 ],
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 40 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
-    "components": [
-      [ [ "fabric_hides_proper", 6, "LIST" ] ],
-      [ [ "rag", 2 ] ],
-      [ [ "kevlar_plate", 4 ] ],
-      [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ],
-      [ [ "duct_tape", 100 ] ]
-    ]
-  },
-  {
     "result": "hood_hsurvivor",
     "type": "recipe",
     "category": "CC_ARMOR",
@@ -231,26 +115,5 @@
       [ [ "hood_rain", 1 ], [ "bag_plastic", 2 ] ],
       [ [ "duct_tape", 100 ] ]
     ]
-  },
-  {
-    "result": "hood_xlhsurvivor",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 7,
-    "skills_required": [ "fabrication", 5 ],
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 40 ] ],
-    "tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
-    "components": [
-      [ [ "fabric_hides_proper", 14, "LIST" ] ],
-      [ [ "rag", 5] ],
-      [ [ "kevlar_plate", 9 ] ],
-      [ [ "steel_chunk", 5 ], [ "scrap", 14 ] ],
-      [ [ "hood_rain", 2 ], [ "bag_plastic", 4 ] ],
-      [ [ "duct_tape", 200 ] ]
-    ]
   }
 ]
diff --git a/json/recipes/recipe_obsolete.json b/json/recipes/recipe_obsolete.json
index 321c22f..1146848 100644
--- a/json/recipes/recipe_obsolete.json
+++ b/json/recipes/recipe_obsolete.json
@@ -6,12 +6,22 @@
   },
   {
     "type": "recipe",
-    "result": "helmet_xlsurvivor",
+    "result": "helmet_hsurvivor",
     "obsolete": false
   },
   {
     "type": "recipe",
-    "result": "helmet_hsurvivor",
-    "obsolete": false
+    "result": "helmet_xlhsurvivor",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "helmet_xlsasurvivor",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "hood_xlhsurvivor",
+    "obsolete": true
   }
 ]