Convert 20xx66mm to use reloaded instead of bootleg in item id.

4 files changed, 33 insertions, 46 deletions

diff --git a/json/items/ammo/20x66mm.json b/json/items/ammo/20x66mm.json
index 9165630..dd2fcaf 100644
--- a/json/items/ammo/20x66mm.json
+++ b/json/items/ammo/20x66mm.json
@@ -15,7 +15,7 @@
     "delete": { "effects": [ "SHOT" ] }
   },
   {
-    "id": "20x66_bootleg_shot",
+    "id": "20x66_shot_reloaded",
     "copy-from": "20x66_shot",
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot, handmade" },
@@ -29,7 +29,7 @@
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
-    "id": "20x66_bootleg_slug",
+    "id": "20x66_slug_reloaded",
     "copy-from": "20x66_slug",
     "type": "AMMO",
     "name": { "str": "20x66mm slug, handmade"  },
@@ -43,7 +43,7 @@
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
-    "id": "20x66_bootleg_flechette",
+    "id": "20x66_flechette_reloaded",
     "copy-from": "20x66_flechette",
     "type": "AMMO",
     "name": { "str": "20x66mm flechette, handmade" },
@@ -57,7 +57,7 @@
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
-    "id": "20x66_bootleg_inc",
+    "id": "20x66_inc_reloaded",
     "copy-from": "20x66_inc",
     "type": "AMMO",
     "name": { "str": "20x66mm incendiary, handmade" },
@@ -71,7 +71,7 @@
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {
-    "id": "20x66_bootleg_flare",
+    "id": "20x66_flare_reloaded",
     "copy-from": "20x66_flare",
     "type": "AMMO",
     "name": { "str": "20x66mm flare, handmade" },
diff --git a/json/items/ammo/migration.json b/json/items/ammo/migration.json
new file mode 100644
index 0000000..3654b70
--- /dev/null
+++ b/json/items/ammo/migration.json
@@ -0,0 +1,12 @@
+[
+  {
+    "id": "20x66_bootleg_inc",
+    "type": "MIGRATION",
+    "replace": "20x66_inc_reloaded"
+  },
+  {
+    "id": "20x66_bootleg_flare",
+    "type": "MIGRATION",
+    "replace": "20x66_flare_reloaded"
+  }
+]
diff --git a/json/recipes/weapons/ammo/rivtech.json b/json/recipes/weapons/ammo/rivtech.json
index 9313a12..ec1bc40 100644
--- a/json/recipes/weapons/ammo/rivtech.json
+++ b/json/recipes/weapons/ammo/rivtech.json
@@ -85,16 +85,16 @@
     ]
   },
   { 
-    "result": "20x66_bootleg_shot",
+    "result": "20x66_shot_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
-    "difficulty": 6,
+    "difficulty": 8,
     "skills_required": [ "gun", 5 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -105,16 +105,16 @@
     ]
   },
   { 
-    "result": "20x66_bootleg_slug",
+    "result": "20x66_slug_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
-    "difficulty": 6,
+    "difficulty": 8,
     "skills_required": [ "gun", 5 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 20 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -125,16 +125,16 @@
     ]
   },
   { 
-    "result": "20x66_bootleg_flechette",
+    "result": "20x66_flechette_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
-    "difficulty": 6,
+    "difficulty": 8,
     "skills_required": [ "gun", 5 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 10 ]  ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -146,16 +146,16 @@
     ]
   },
   { 
-    "result": "20x66_bootleg_inc",
+    "result": "20x66_inc_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
-    "difficulty": 6,
+    "difficulty": 8,
     "skills_required": [ "gun", 5 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 10 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -167,16 +167,16 @@
     ]
   },
   { 
-    "result": "20x66_bootleg_flare",
+    "result": "20x66_flare_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
-    "difficulty": 6,
+    "difficulty": 8,
     "skills_required": [ "gun", 5 ],
     "time": "2 m",
     "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_caseless", 4 ] ],
+    "book_learn": [ [ "recipe_caseless", 5 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 10 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -214,6 +214,6 @@
     "book_learn": [ [ "recipe_caseless", 5 ] ],
     "using": [ [ "surface_heat", 10 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [ [ [ "plastic_chunk", 1 ] ] ]
+    "components": [ [ [ "plastic_chunk", 4 ] ] ]
   }
 ]
diff --git a/json/recipes/weapons/recipe_obsolete.json b/json/recipes/weapons/recipe_obsolete.json
index 5da5b1a..24d8699 100644
--- a/json/recipes/weapons/recipe_obsolete.json
+++ b/json/recipes/weapons/recipe_obsolete.json
@@ -1,31 +1,6 @@
 [
   {
     "type": "recipe",
-    "result": "20x66_bootleg_shot",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "20x66_bootleg_slug",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "20x66_bootleg_flechette",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "20x66_bootleg_inc",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "20x66_bootleg_flare",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
     "result": "8mm_bootleg_jhp",
     "obsolete": false
   },