460 S&W reloads (CleverRaven#80071)

* 460 reloads

* GG obsoletion

* GG migration

* Add uncrafts

Author: Holli-Git

data/json/items/ammo/460sw.json

@@ -25,6 +25,15 @@
     "recoil": 2900,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "reloaded_460sw",
+    "copy-from": "460sw",
+    "type": "AMMO",
+    "name": { "str_sp": ".460 S&W Magnum FTX, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
   {
     "id": "460sw_jhp",
     "//": "Based on https://www.federalpremium.com/handgun/premium-handgun-hunting/swift-a-frame/11-P460SA.html, multiplying the damage by 1.2 to account for the fact it's JHP.",
@@ -50,5 +59,14 @@
     "dispersion": 30,
     "recoil": 2900,
     "effects": [ "COOKOFF" ]
+  },
+  {
+    "id": "reloaded_460sw_jhp",
+    "copy-from": "460sw_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": ".460 S&W Magnum JHP, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]

data/json/recipes/ammo/pistol.json

@@ -1493,6 +1493,44 @@
     "//": "278 mg gunpowder rounded to 3 100 mg 'pieces'",
     "components": [ [ [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ]
   },
+  {
+    "result": "reloaded_460sw",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ] ],
+    "charges": 1,
+    "reversible": { "time": "5 s" },
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_460sw", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "//": "2683 mg gunpowder rounded to 27 100 mg 'pieces'",
+    "components": [ [ [ "gunpowder_magnum_pistol", 27 ] ], [ [ "copper", 1 ] ] ]
+  },
+  {
+    "result": "reloaded_460sw_jhp",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ] ],
+    "charges": 1,
+    "reversible": { "time": "5 s" },
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ], [ "ammo_460sw", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "//": "2624 mg gunpowder rounded to 26 100 mg 'pieces'",
+    "components": [ [ [ "gunpowder_magnum_pistol", 26 ] ], [ [ "copper", 1 ] ] ]
+  },
   {
     "result": "matchhead_9mm",
     "type": "recipe",

data/json/requirements/ammo.json

@@ -124,6 +124,12 @@
     "//": "Components required for .300 AAC Blackout ammo",
     "components": [ [ [ "300blk_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ] ]
   },
+  {
+    "id": "ammo_460sw",
+    "type": "requirement",
+    "//": "Components required for .460 S&W ammo",
+    "components": [ [ [ "460sw_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ]
+  },
   {
     "id": "22_casehead",
     "type": "requirement",

data/json/uncraft/ammo/460sw.json

@@ -0,0 +1,32 @@
+[
+  {
+    "result": "460sw",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "skill_used": "gun",
+    "time": "5 s",
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "lead", 3 ] ],
+      [ [ "460sw_casing", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder_magnum_pistol", 27 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  },
+  {
+    "result": "460sw_jhp",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "skill_used": "gun",
+    "time": "5 s",
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "lead", 4 ] ],
+      [ [ "460sw_casing", 1 ] ],
+      [ [ "lgrifle_primer", 1 ] ],
+      [ [ "gunpowder_magnum_pistol", 26 ] ],
+      [ [ "copper", 1 ] ]
+    ]
+  }
+]

data/mods/Generic_Guns/ammo/gg_ammo_migration.json

@@ -228,7 +228,17 @@
     "replace": "bp_pistol_magnum_ball"
   },
   {
-    "id": [ "357mag_jhp", "44magnum", "454_Casull", "500_Magnum", "50ae_jhp", "460sw", "460sw_jhp" ],
+    "id": [
+      "357mag_jhp",
+      "44magnum",
+      "454_Casull",
+      "500_Magnum",
+      "50ae_jhp",
+      "460sw",
+      "460sw_jhp",
+      "reloaded_460sw",
+      "reloaded_460sw_jhp"
+    ],
     "type": "MIGRATION",
     "replace": "pistol_magnum_jhp"
   },

data/mods/Generic_Guns/recipes/recipe_obsolete.json

@@ -1138,5 +1138,15 @@
     "type": "recipe",
     "result": "ruger_charger_auto",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "reloaded_460sw",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "reloaded_460sw_jhp",
+    "obsolete": true
   }
 ]