Granularize Cartridge Reloading Part 1: Gotta keep em separated (#33310)

* from 1 came many (gunpowders)
Gotta keep em separated
* recipe to make uniform powder.
* Gunpowder spawn chances
* snippets, artillery powder desc
* update min qty
1lb is most common for powders
* steel mesh sources
* sieve recipe and req add
* Powder overlap
first attempt at getting powder overlap on paper. needs work still.
* -BP 40mm
* split pistol+shot powder
* shotgun powder overlaps

data/json/itemgroups/SUS_specific_use_storage_items.json

@@ -168,6 +168,8 @@
       { "item": "pot_copper", "prob": 75 },
       { "item": "stock_pot", "prob": 50 },
       { "item": "pot_canning", "prob": 25 },
+      { "item": "colander_steel", "prob": 40 },
+      { "item": "splatter_guard", "prob": 20 },
       { "item": "pan", "count": [ 1, 2 ] },
       { "item": "steel_pan", "prob": 80 },
       { "item": "copper_pan", "prob": 30 },

data/json/itemgroups/ammo.json

@@ -343,7 +343,12 @@
     "id": "ammo_parts",
     "//": "Raw materials for assembling ammo excluding casings.",
     "items": [
-      [ "gunpowder", 320 ],
+      [ "gunpowder_shotgun", 20 ],
+      [ "gunpowder_pistol", 105 ],
+      [ "gunpowder_magnum_pistol", 60 ],
+      [ "gunpowder_rifle", 85 ],
+      [ "gunpowder_large_rifle", 40 ],
+      [ "gunpowder_artillery", 5 ],
       [ "incendiary", 20 ],
       [ "lead", 160 ],
       [ "shotgun_primer", 80 ],

data/json/itemgroups/collections_domestic.json

@@ -66,6 +66,8 @@
       [ "pressure_cooker", 5 ],
       [ "teapot", 40 ],
       [ "kettle", 40 ],
+      [ "colander_steel", 35 ],
+      [ "splatter_guard", 10 ],
       [ "jar_glass", 50 ],
       [ "jar_3l_glass", 40 ],
       [ "bowl_pewter", 25 ],

data/json/items/ammo.json

@@ -468,20 +468,68 @@
     "type": "AMMO",
     "id": "gunpowder",
     "category": "chems",
-    "price": 3000,
-    "name": "gunpowder",
+    "price": 500,
+    "name": "mixed gunpowder",
     "symbol": "=",
     "color": "dark_gray",
-    "description": "Firearm-quality gunpowder.",
-    "container": "bottle_plastic_small",
+    "description": "Firearm-quality gunpowder, mixed without concern for composition, burn rate or shape.  It has been slightly ground to make its properties more uniform.  Only the truly desperate would attempt to reload with this.",
+    "container": "bottle_plastic",
     "material": "powder",
     "flags": [ "TINDER" ],
     "volume": "250 ml",
     "weight": 1,
     "ammo_type": "components",
-    "count": 200,
+    "count": 454,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_shotgun",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "smokeless shotgun powder",
+    "description": "Firearm-quality gunpowder, intended for use in shotgun shells."
+  },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_pistol",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "smokeless pistol powder",
+    "description": "Firearm-quality gunpowder, intended for use in pistol ammunition."
+  },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_magnum_pistol",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "smokeless magnum powder",
+    "description": "Firearm-quality gunpowder intended for use in magnum pistol ammunition."
+  },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_rifle",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "smokeless rifle powder",
+    "description": "Firearm-quality gunpowder intended for use in rifle ammunition."
+  },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_large_rifle",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "smokeless overbore rifle powder",
+    "description": "Firearm-quality gunpowder intended for use in large rifle ammunition."
+  },
+  {
+    "type": "AMMO",
+    "id": "gunpowder_artillery",
+    "copy-from": "gunpowder",
+    "price": 3000,
+    "name": "artillery propellant",
+    "description": "Single base smokeless gunpowder intended for use in artillery propelling charges."
+  },
   {
     "type": "AMMO",
     "id": "oxy_powder",

data/json/items/generic/dining_kitchen.json

@@ -805,6 +805,29 @@
     "container_data": { "contains": "1500 ml", "watertight": true },
     "delete": { "qualities": [ [ "COOK", 3 ] ] }
   },
+  {
+    "id": "colander_steel",
+    "name": "mesh colander",
+    "category": "other",
+    "description": "A stainless steel mesh colander, for washing rice, vegetables or straining liquid off from noodles or other foods.",
+    "type": "GENERIC",
+    "volume": 2,
+    "weight": 318,
+    "symbol": ")",
+    "price": 600,
+    "price_postapoc": 5
+  },
+  {
+    "id": "splatter_guard",
+    "name": "splatter guard",
+    "description": "A stainless steel mesh screen for preventing flying oil from getting all over your nice counters (or you) when frying.",
+    "type": "GENERIC",
+    "volume": 2,
+    "weight": 357,
+    "symbol": ")",
+    "price": 600,
+    "price_postapoc": 5
+  },
   {
     "id": "cutting_board",
     "type": "GENERIC",

data/json/items/tools.json

@@ -861,6 +861,20 @@
     "charges_per_use": 1,
     "use_action": "CAN_GOO"
   },
+  {
+    "id": "sieve_steel",
+    "type": "GENERIC",
+    "category": "tools",
+    "name": "sieve",
+    "description": "This is no mere strainer for noodles; it's a sieve used to separate particles of certain sizes.  You could use this to do a really good job sifting flour, remove dust and soil from grain, or perhaps conduct gradiation tests for any civil engineers you might know.  This one has been constructed from steel mesh.",
+    "weight": 318,
+    "volume": 2,
+    "price": 700,
+    "bashing": 2,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "dark_gray"
+  },
   {
     "id": "carding_paddles",
     "type": "GENERIC",

data/json/recipes/ammo/components.json

@@ -12,6 +12,27 @@
     "qualities": [ { "id": "CHEM", "level": 1 } ],
     "components": [ [ [ "magnesium", 100 ], [ "chem_aluminium_powder", 100 ] ], [ [ "oxy_powder", 200 ] ] ]
   },
+  {
+    "result": "gunpowder",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_COMPONENTS",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "15 s",
+    "book_learn": [ [ "pocket_firearms", 3 ], [ "manual_gun", 2 ], [ "recipe_bullets", 1 ], [ "textbook_anarch", 0 ] ],
+    "tools": [ [ [ "mortar_pestle", -1 ] ], [ [ "sieve_steel", -1 ] ] ],
+    "components": [
+      [
+        [ "gunpowder_shotgun", 1 ],
+        [ "gunpowder_pistol", 1 ],
+        [ "gunpowder_magnum_pistol", 1 ],
+        [ "gunpowder_rifle", 1 ],
+        [ "gunpowder_large_rifle", 1 ],
+        [ "gunpowder_artillery", 1 ]
+      ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "460_casing",

data/json/recipes/ammo/grenades.json

@@ -14,7 +14,7 @@
     "charges": 1,
     "using": [ [ "ammo_40mm", 1 ] ],
     "tools": [ [ [ "press", -1 ] ] ],
-    "components": [ [ [ "gunpowder", 30 ] ], [ [ "combatnail", 25 ] ] ]
+    "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 3 ] ], [ [ "combatnail", 25 ] ] ]
   },
   {
     "result": "40mm_shot",
@@ -30,7 +30,7 @@
     "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 2 ], [ "ammo_40mm", 1 ], [ "ammo_bullet", 12 ] ],
-    "components": [ [ [ "gunpowder", 30 ] ] ]
+    "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 30 ] ] ]
   },
   {
     "result": "40mm_slug",
@@ -46,6 +46,6 @@
     "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ],
     "charges": 1,
     "using": [ [ "bullet_forming", 3 ], [ "ammo_40mm", 1 ], [ "ammo_bullet", 12 ] ],
-    "components": [ [ [ "gunpowder", 36 ] ], [ [ "plastic_chunk", 1 ] ] ]
+    "components": [ [ [ "gunpowder", 36 ], [ "gunpowder_pistol", 36 ], [ "gunpowder_shotgun", 2 ] ], [ [ "plastic_chunk", 1 ] ] ]
   }
 ]