Generic Guns rework

data/json/recipes/ammo/shot.json

@@ -228,15 +228,22 @@
     "components": [ [ [ "chem_black_powder", 6 ] ] ]
   },
   {
-    "result": "bp_shot_scrap",
-    "id_suffix": "with dowel",
+    "result": "shot_scrap",
     "type": "recipe",
-    "copy-from": "bp_shot_scrap",
-    "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
-    "time": 4000,
-    "tools": [ [ [ "press_dowel", -1 ] ] ],
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_SHOT",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 50, 5 ],
+    "autolearn": true,
+    "charges": 2,
+    "reversible": true,
+    "using": [ [ "ammo_shot", 2 ] ],
+    "tools": [ [ [ "press", -1 ] ] ],
     "components": [
-      [ [ "chem_black_powder", 6 ] ],
+      [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ],
       [
         [ "scrap", 1 ],
         [ "nail", 10 ],
@@ -247,13 +254,13 @@
         [ "bearing", 5 ],
         [ "lead", 7 ],
         [ "silver_small", 7 ],
-        [ "lead", 7 ],
+        [ "bismuth", 7 ],
         [ "shrapnel", 4 ]
       ]
     ]
   },
   {
-    "result": "shot_scrap",
+    "result": "bp_shot_scrap",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
@@ -268,7 +275,7 @@
     "using": [ [ "ammo_shot", 2 ] ],
     "tools": [ [ [ "press", -1 ] ] ],
     "components": [
-      [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ],
+      [ [ "chem_black_powder", 6 ] ],
       [
         [ "scrap", 1 ],
         [ "nail", 10 ],
@@ -279,26 +286,19 @@
         [ "bearing", 5 ],
         [ "lead", 7 ],
         [ "silver_small", 7 ],
-        [ "bismuth", 7 ],
+        [ "lead", 7 ],
         [ "shrapnel", 4 ]
       ]
     ]
   },
   {
     "result": "bp_shot_scrap",
+    "id_suffix": "with dowel",
     "type": "recipe",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "difficulty": 2,
-    "skills_required": [ "gun", 1 ],
-    "time": "2 m",
-    "batch_time_factors": [ 50, 5 ],
-    "autolearn": true,
-    "charges": 2,
-    "reversible": true,
-    "using": [ [ "ammo_shot", 2 ] ],
-    "tools": [ [ [ "press", -1 ] ] ],
+    "copy-from": "bp_shot_scrap",
+    "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ],
+    "time": 4000,
+    "tools": [ [ [ "press_dowel", -1 ] ] ],
     "components": [
       [ [ "chem_black_powder", 6 ] ],
       [

data/mods/Generic_Guns/ammo/black_powder.json

@@ -0,0 +1,18 @@
+[
+  {
+    "id": "black_powder_ball",
+    "type": "AMMO",
+    "copy-from": "flintlock_ammo",
+    "name": "paper cartridge",
+    "description": "A paper cartridge containing black powder and a lead ball.  Historically used to reload muzzleloaders in a more reasonable time.",
+    "ammo_type": "ammo_black_powder"
+  },
+  {
+    "id": "black_powder_shot",
+    "type": "AMMO",
+    "copy-from": "flintlock_shot",
+    "name": "paper shot cartridge",
+    "description": "A paper cartridge containing black powder and metallic shot.  Historically used to reload muzzleloaders in a more reasonable time.",
+    "ammo_type": "ammo_black_powder"
+  }
+]

data/mods/Generic_Guns/ammo/casings.json

@@ -0,0 +1,72 @@
+[
+  {
+    "id": "pistol_tiny_casing",
+    "copy-from": "32_casing",
+    "type": "GENERIC",
+    "name": "tiny pistol casing",
+    "description": "An empty casing from a tiny pistol round."
+  },
+  {
+    "id": "pistol_casing",
+    "copy-from": "9mm_casing",
+    "type": "GENERIC",
+    "name": "pistol casing",
+    "description": "An empty casing from a standard pistol round."
+  },
+  {
+    "id": "pistol_magnum_casing",
+    "copy-from": "44_casing",
+    "type": "GENERIC",
+    "name": "magnum pistol casing",
+    "description": "An empty casing from a magnum pistol round."
+  },
+  {
+    "id": "rifle_casing",
+    "copy-from": "308_casing",
+    "type": "GENERIC",
+    "name": "rifle casing",
+    "description": "An empty casing from a rifle round."
+  },
+  {
+    "id": "rifle_huge_casing",
+    "copy-from": "50_casing",
+    "type": "GENERIC",
+    "name": "huge rifle casing",
+    "description": "An empty casing from a huge rifle round."
+  },
+  {
+    "id": "shot_casing",
+    "copy-from": "shot_hull",
+    "type": "GENERIC",
+    "name": "shotshell hull",
+    "description": "A shotshell's casing, a plastic tube with a brass casehead, commonly referred to as a hull."
+  },
+  {
+    "id": "grenade_casing",
+    "copy-from": "40x46mm_m199_casing",
+    "type": "GENERIC",
+    "name": "grenade casing",
+    "description": "A large casing from a grenade round."
+  },
+  {
+    "id": "ammolinkrifle",
+    "copy-from": "ammolink",
+    "type": "GENERIC",
+    "name": "rifle belt linkage",
+    "use_action": { "type": "ammobelt", "belt": "rifle_belt" }
+  },
+  {
+    "id": "ammolinkgrenade",
+    "copy-from": "ammolink",
+    "type": "GENERIC",
+    "name": "grenade belt linkage",
+    "use_action": { "type": "ammobelt", "belt": "grenade_belt" }
+  },
+  {
+    "id": "ammolinkrifle_huge",
+    "copy-from": "ammolink",
+    "type": "GENERIC",
+    "name": "heavy machinegun belt linkage",
+    "use_action": { "type": "ammobelt", "belt": "rifle_huge_belt" }
+  }
+]