Expand .357 Magnum

data/json/itemgroups/ammo.json

@@ -9,6 +9,8 @@
       [ "380_JHP", 20 ],
       [ "38_fmj", 25 ],
       [ "38_special", 25 ],
+      [ "357mag_fmj", 15 ],
+      [ "357mag_jhp", 15 ],
       [ "357sig_jhp", 25 ],
       [ "357sig_fmj", 25 ],
       [ "40sw", 40 ],
@@ -68,6 +70,8 @@
       [ "reloaded_38_fmj", 30 ],
       [ "reloaded_38_special", 80 ],
       [ "reloaded_38_super", 40 ],
+      [ "reloaded_357mag_fmj", 30 ],
+      [ "reloaded_357mag_jhp", 30 ],
       [ "reloaded_380_JHP", 10 ],
       [ "reloaded_380_FMJ", 15 ],
       [ "reloaded_380_p", 5 ],

data/json/items/ammo/357mag.json

@@ -28,5 +28,21 @@
     "name": ".357 magnum JHP",
     "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
     "relative": { "damage": 4, "pierce": -2 }
+  },
+  {
+    "id": "reloaded_357mag_fmj",
+    "copy-from": "357mag_fmj",
+    "type": "AMMO",
+    "name": "reloaded .357 Magnum FMJ",
+    "name_plural": "reloaded .357 Magnum FMJ",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
+  },
+  {
+    "id": "reloaded_357mag_jhp",
+    "copy-from": "357mag_jhp",
+    "type": "AMMO",
+    "name": "reloaded .357 Magnum JHP",
+    "name_plural": "reloaded .357 Magnum JHP",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
   }
 ]

data/json/items/magazine/38.json

@@ -35,30 +35,30 @@
   {
     "id": "38_speedloader",
     "type": "MAGAZINE",
-    "name": ".38 7-round speedloader",
-    "description": "This speedloader can hold 7 rounds of .38 and quickly reload a compatible revolver.",
+    "name": ".38/.357 7-round speedloader",
+    "description": "This speedloader can hold 7 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.",
     "weight": 80,
     "volume": 1,
     "price": 1000,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "38",
+    "ammo_type": [ "357mag", "38" ],
     "capacity": 7,
     "flags": [ "SPEEDLOADER" ]
   },
   {
     "id": "38_speedloader5",
     "type": "MAGAZINE",
-    "name": ".38 5-round speedloader",
-    "description": "This speedloader can hold 5 rounds of .38 and quickly reload a compatible revolver.",
+    "name": ".38/.357 5-round speedloader",
+    "description": "This speedloader can hold 5 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.",
     "weight": 60,
     "volume": 1,
     "price": 800,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "38",
+    "ammo_type": [ "357mag", "38" ],
     "capacity": 5,
     "flags": [ "SPEEDLOADER" ]
   }

data/json/recipes/ammo/pistol.json

@@ -127,6 +127,38 @@
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
     "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ]
   },
+  {
+    "result": "reloaded_357mag_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ],
+    "components": [ [ [ "gunpowder", 5 ] ] ]
+  },
+  {
+    "result": "reloaded_357mag_jhp",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ],
+    "components": [ [ [ "gunpowder", 5 ] ] ]
+  },
   {
     "result": "bp_38_special",
     "type": "recipe",

data/json/requirements/ammo.json

@@ -27,5 +27,11 @@
     "type": "requirement",
     "//": "Components required for shotgun and signal flare ammo",
     "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ] ]
+  },
+  {
+    "id": "ammo_357mag",
+    "type": "requirement",
+    "//": "Components required for .357 Magnum ammo",
+    "components": [ [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ] ]
   }
 ]

data/json/uncraft/ammo/357mag.json

@@ -0,0 +1,18 @@
+[
+  {
+    "result": "357mag_fmj",
+    "type": "uncraft",
+    "time": 500,
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  },
+  {
+    "result": "357mag_jhp",
+    "type": "uncraft",
+    "time": 500,
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  }
+]