Convert 8x40 ammo to new id.

4 files changed, 30 insertions, 88 deletions

diff --git a/json/items/ammo/8x40mm.json b/json/items/ammo/8x40mm.json
deleted file mode 100644
index 6361224..0000000
--- a/json/items/ammo/8x40mm.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-  {
-    "id": "8mm_bootleg_jhp",
-    "copy-from": "8mm_jhp",
-    "type": "AMMO",
-    "name": { "str": "8x40mm JHP, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm JHP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": {
-      "price": 0.7,
-      "damage": { "damage_type": "bullet", "amount": 0.9 },
-      "dispersion": 1.1
-    },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
-  },
-  {
-    "id": "8mm_bootleg_caseless",
-    "copy-from": "8mm_caseless",
-    "type": "AMMO",
-    "name": { "str": "8x40mm caseless, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm standard caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": {
-      "price": 0.7,
-      "damage": { "damage_type": "bullet", "amount": 0.9 },
-      "dispersion": 1.1
-    },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
-  },
-  {
-    "id": "8mm_bootleg_fmj",
-    "copy-from": "8mm_fmj",
-    "type": "AMMO",
-    "name": { "str": "8x40mm FMJ, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm FMJ caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": {
-      "price": 0.7,
-      "damage": { "damage_type": "bullet", "amount": 0.9 },
-      "dispersion": 1.1
-    },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
-  },
-  {
-    "id": "8mm_bootleg_inc",
-    "copy-from": "8mm_inc",
-    "type": "AMMO",
-    "name": { "str": "8x40mm tracer, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm tracer caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": {
-      "price": 0.7,
-      "damage": { "damage_type": "bullet", "amount": 0.9 },
-      "dispersion": 1.1
-    },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
-  }
-]
diff --git a/json/items/ammo/migration.json b/json/items/ammo/migration.json
index 3654b70..b666342 100644
--- a/json/items/ammo/migration.json
+++ b/json/items/ammo/migration.json
@@ -8,5 +8,20 @@
     "id": "20x66_bootleg_flare",
     "type": "MIGRATION",
     "replace": "20x66_flare_reloaded"
+  },
+  {
+    "id": "8mm_bootleg_jhp",
+    "type": "MIGRATION",
+    "replace": "8mm_jhp_reloaded"
+  },
+  {
+    "id": "8mm_bootleg_fmj",
+    "type": "MIGRATION",
+    "replace": "8mm_fmj_reloaded"
+  },
+  {
+    "id": "8mm_hvp_reloaded",
+    "type": "MIGRATION",
+    "replace": "8mm_fmj_reloaded"
   }
 ]
diff --git a/json/recipes/weapons/ammo/rivtech.json b/json/recipes/weapons/ammo/rivtech.json
index ec1bc40..7c6ed67 100644
--- a/json/recipes/weapons/ammo/rivtech.json
+++ b/json/recipes/weapons/ammo/rivtech.json
@@ -1,15 +1,15 @@
 [
  { 
-    "result": "8mm_bootleg_jhp",
+    "result": "8mm_jhp_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "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", 8 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -21,16 +21,16 @@
     ]
   },
  { 
-    "result": "8mm_bootleg_caseless",
+    "result": "8mm_caseless_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "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", 8 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -42,16 +42,16 @@
     ]
   },
  { 
-    "result": "8mm_bootleg_fmj",
+    "result": "8mm_fmj_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "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", 8 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -63,16 +63,16 @@
     ]
   },
  { 
-    "result": "8mm_bootleg_inc",
+    "result": "8mm_inc_reloaded",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "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", 8 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
@@ -199,7 +199,7 @@
     "book_learn": [ [ "recipe_caseless", 5 ]  ],
     "using": [ [ "surface_heat", 10 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
-    "components": [ [ [ "plastic_chunk", 1 ] ] ]
+    "components": [ [ [ "plastic_chunk", 4 ] ] ]
   },
   {
     "result": "20x66_mold",
diff --git a/json/recipes/weapons/recipe_obsolete.json b/json/recipes/weapons/recipe_obsolete.json
index 24d8699..0a45e21 100644
--- a/json/recipes/weapons/recipe_obsolete.json
+++ b/json/recipes/weapons/recipe_obsolete.json
@@ -1,22 +1,7 @@
 [
   {
     "type": "recipe",
-    "result": "8mm_bootleg_jhp",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "8mm_bootleg_caseless",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "8mm_bootleg_fmj",
-    "obsolete": false
-  },
-  {
-    "type": "recipe",
-    "result": "8mm_bootleg_inc",
-    "obsolete": false
+    "result": "8mm_hvp_reloaded",
+    "obsolete": true
   }
 ]