summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-13 02:41:44 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-13 02:41:44 -0700
commit6ab6b597191d32b00990cec11c30a262014d4c95 (patch)
tree35adab6a9e3468dbe53f7b9d9b925bbe27c38c68
parentConvert recipes from rdx to composition_b (diff)
downloadcataclysm-dda-mod_grenade-crafting-6ab6b597191d32b00990cec11c30a262014d4c95.tar.xz
Allow m576 to use mixed gunpowder
-rw-r--r--json/recipes/ammo/40x46.json8
-rw-r--r--readme3
2 files changed, 6 insertions, 5 deletions
diff --git a/json/recipes/ammo/40x46.json b/json/recipes/ammo/40x46.json
index 8837e2a..1ed3d61 100644
--- a/json/recipes/ammo/40x46.json
+++ b/json/recipes/ammo/40x46.json
@@ -1,12 +1,12 @@
[
{
"result": "40x46mm_m433",
- "type" : "recipe",
+ "type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_GRENADES",
"skill_used": "fabrication",
- "skills_required": [ "mechanics", 6 ],
"difficulty": 6,
+ "skills_required": [ "mechanics", 6 ],
"time": "30 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "textbook_anarch", 7 ] ],
@@ -39,7 +39,7 @@
"components": [
[ [ "paper", 1 ], [ "wax", 1 ] ],
[ [ "sheet_metal_small", 6 ] ],
- [ [ "gunpowder_shotgun", 30 ] ],
+ [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ],
[ [ "40x46mm_m199_casing", 1 ] ],
[ [ "smpistol_primer", 1 ] ]
]
@@ -50,8 +50,8 @@
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_GRENADES",
"skill_used": "cooking",
- "skills_required": [ "mechanics", 6 ],
"difficulty": 6,
+ "skills_required": [ "mechanics", 6 ],
"time": "30 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "textbook_anarch", 7 ] ],
diff --git a/readme b/readme
index 8a4427d..cc9749c 100644
--- a/readme
+++ b/readme
@@ -10,6 +10,7 @@ C-4 Explosives
40x46mm M433
40x46mm M576
40x46mm M651
+composition b
Rename grenade to fragmentation grenade
Rename flashbang to flashbang grenade
@@ -22,4 +23,4 @@ Fix the wildly inconsistent use of grenade, canister, armed, active, lit amongst
Todo-
-Clean up smaoke grenade recipe
+Clean up smoke grenade recipe