Add 4.6mm FMJ and SHP rounds, with itemgroups and uncraft.

-Also add reloaded and black powder variants with itemgroups and recipes.

5 files changed, 242 insertions, 2 deletions

diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
index ad791c8..46e1132 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -1,6 +1,36 @@
 [
   {
     "type": "item_group",
+    "id": "ammo_pistol_milspec",
+    "//": "Military specification pistol ammo found at military sites.",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "46mm_fmj", "prob": 70 },
+      { "item": "46mm_shp", "prob": 70 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_pistol_modern_handloads",
+    "//": "Reloaded pistol ammo balanced according to rarity.",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "reloaded_46mm_fmj", "prob": 20 },
+      { "item": "reloaded_46mm_shp", "prob": 20 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_pistol_blackpowder_handloads",
+    "//": "Blackpowder pistol ammo balanced according to rarity, additional weight for calibers that have common, manual-action firearms available in that chambering.",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "bp_46mm_fmj", "prob": 20 },
+      { "item": "bp_46mm_shp", "prob": 20 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "ammo_rifle_milspec",
     "//": "Military specification rifle ammo found at military sites.",
     "subtype": "distribution",
diff --git a/json/itemgroups/military.json b/json/itemgroups/military.json
index a492048..96d5403 100644
--- a/json/itemgroups/military.json
+++ b/json/itemgroups/military.json
@@ -7,6 +7,8 @@
       { "item": "hk_ucp", "prob": 7 },
       { "item": "hk_mp7", "prob": 7 },
       { "item": "46mm", "prob": 7 },
+      { "item": "46mm_fmj", "prob": 7 },
+      { "item": "46mm_shp", "prob": 7 },
       { "item": "hk_g11", "prob": 7 },
       { "item": "hk_caws", "prob": 5 },
       { "item": "shot_000", "prob": 5 },
diff --git a/json/items/ammo/46.json b/json/items/ammo/46.json
index 0a21d61..2eb9b91 100644
--- a/json/items/ammo/46.json
+++ b/json/items/ammo/46.json
@@ -27,7 +27,7 @@
     "copy-from": "46mm",
     "type": "AMMO",
     "name": { "str": "4.6x30mm DM11, reloaded" },
-    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": {
       "price": 0.7,
       "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 },
@@ -41,7 +41,7 @@
     "copy-from": "46mm",
     "type": "AMMO",
     "name": { "str": "4.6x30mm DM11, black powder" },
-    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.46, "armor_penetration": 0.1 },
@@ -50,5 +50,99 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "46mm_fmj",
+    "copy-from": "46mm",
+    "type": "AMMO",
+    "looks_like": "46mm",
+    "name": { "str": "4.6x30mm FMJ" },
+    "description": "4.6x30mm ammunition with 42gr copper plated steel jacket and lead-antimony core bullets. The FMJ round has longer range and greater wounding potential, albeit with slightly more recoil and reduced muzzle velocity.",
+    "weight": "7000 mg",
+    "proportional": {
+      "price": 1.3,
+      "recoil": 1.2,
+      "dispersion": 1.1
+    },
+    "relative": {
+      "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -8 },
+      "range": 4
+    }
+  },
+  {
+    "id": "reloaded_46mm_fmj",
+    "copy-from": "46mm_fmj",
+    "type": "AMMO",
+    "looks_like": "reloaded_46mm",
+    "name": { "str": "4.6x30mm FMJ, reloaded" },
+    "description": "4.6x30mm ammunition with 42gr copper plated steel jacket and lead-antimony core bullets. The FMJ round has longer range and greater wounding potential, albeit with slightly more recoil and reduced muzzle velocity. This one has been hand-reloaded.",
+    "proportional": {
+      "price": 0.7,
+      "damage": { "damage_type": "bullet", "amount": 0.9 },
+      "dispersion": 1.1
+    },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_46mm_fmj",
+    "copy-from": "46mm_fmj",
+    "type": "AMMO",
+    "looks_like": "reloaded_46mm",
+    "name": { "str": "4.6x30mm FMJ, black powder" },
+    "description": "4.6x30mm ammunition with 42gr copper plated steel jacket and lead-antimony core bullets. The FMJ round has longer range and greater wounding potential, albeit with slightly more recoil and reduced muzzle velocity. This one has been hand-reloaded with black powder.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "46mm_shp",
+    "copy-from": "46mm",
+    "type": "AMMO",
+    "looks_like": "46mm",
+    "name": { "str": "4.6x30mm SHP" },
+    "description": "4.6x30mm ammunition with 31gr copper plated brass bullets. The Action Law Enforcement solid hollow point round is optimized for use against soft targets, while still having decent penetration.",
+    "proportional": {
+      "price": 0.8,
+    },
+    "relative": {
+      "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -16 }
+    }
+  },
+  {
+    "id": "reloaded_46mm_shp",
+    "copy-from": "46mm_shp",
+    "type": "AMMO",
+    "looks_like": "reloaded_46mm",
+    "name": { "str": "4.6x30mm SHP, reloaded" },
+    "description": "4.6x30mm ammunition with 31gr copper plated brass bullets. The Action Law Enforcement solid hollow point round is optimized for use against soft targets, while still having decent penetration. This one has been hand-reloaded.",
+    "proportional": {
+      "price": 0.7,
+      "damage": { "damage_type": "bullet", "amount": 0.9 },
+      "dispersion": 1.1
+    },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_46mm_shp",
+    "copy-from": "46mm_shp",
+    "type": "AMMO",
+    "looks_like": "reloaded_46mm",
+    "name": { "str": "4.6x30mm SHP, black powder" },
+    "description": "4.6x30mm ammunition with 31gr copper plated brass bullets. The Action Law Enforcement solid hollow point round is optimized for use against soft targets, while still having decent penetration. This one has been hand-reloaded with black powder.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/recipes/46.json b/json/recipes/46.json
new file mode 100644
index 0000000..67d8958
--- /dev/null
+++ b/json/recipes/46.json
@@ -0,0 +1,82 @@
+[
+  { 
+    "result": "reloaded_46mm_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ]
+    ]
+  },
+  { 
+    "result": "bp_46mm_fmj",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "chem_black_powder", 6 ] ]
+    ]
+  },
+  { 
+    "result": "reloaded_46mm_shp",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ]
+    ]
+  },
+  { 
+    "result": "bp_46mm_shp",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "skills_required": [ "gun", 3 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "components": [
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "chem_black_powder", 6 ] ]
+    ]
+  }
+]
diff --git a/json/uncraft/46.json b/json/uncraft/46.json
new file mode 100644
index 0000000..790c191
--- /dev/null
+++ b/json/uncraft/46.json
@@ -0,0 +1,32 @@
+[
+  {
+    "result": "46mm_fmj",
+    "type": "uncraft",
+    "skill_used": "gun",
+    "difficulty": 5,
+    "time": "1 s",
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "lead", 2 ] ],
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  },
+  {
+    "result": "46mm_shp",
+    "type": "uncraft",
+    "skill_used": "gun",
+    "difficulty": 5,
+    "time": "1 s",
+    "qualities": [ { "id": "PULL", "level": 1 } ],
+    "components": [
+      [ [ "lead", 2 ] ],
+      [ [ "46mm_casing", 1 ] ],
+      [ [ "smpistol_primer", 1 ] ],
+      [ [ "gunpowder", 4 ] ]
+    ],
+    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
+  }
+]