summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-04 21:55:34 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-07-04 21:55:34 -0700
commit0f02375eb7477145ba16e0d7bf8460c33e436275 (patch)
tree7ea99e4423aa7661bf95a3d152cc3205134245b4
parentReduce duplication of item references (diff)
downloadcataclysm-dda-mod_recipe-fixes-0f02375eb7477145ba16e0d7bf8460c33e436275.tar.xz
Fix 300blk recipe to allow other gunpowder types
-rw-r--r--Readme.txt6
-rw-r--r--json/recipes/ammo/rifle.json21
2 files changed, 27 insertions, 0 deletions
diff --git a/Readme.txt b/Readme.txt
index 2fea3ce..c59c0c8 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -24,3 +24,9 @@ Curry without Meat could be made with these.
Change anesthetic to 500 ml batches instead of 540 ml
Everything else is in mulitples of 250 ml.
+
+--
+
+300blk ammunition can now be crafted with magnum and rifle powder.
+Comparable .223, 5.56mm , and 762x39mm could use these.
+
diff --git a/json/recipes/ammo/rifle.json b/json/recipes/ammo/rifle.json
new file mode 100644
index 0000000..795fd22
--- /dev/null
+++ b/json/recipes/ammo/rifle.json
@@ -0,0 +1,21 @@
+[
+ {
+ "result": "reloaded_300blk",
+ "type": "recipe",
+ "category": "CC_AMMO",
+ "subcategory": "CSC_AMMO_RIFLE",
+ "skill_used": "fabrication",
+ "difficulty": 5,
+ "skills_required": [ "gun", 5 ],
+ "time": "2 m",
+ "batch_time_factors": [ 60, 5 ],
+ "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ],
+ "charges": 1,
+ "reversible": true,
+ "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 5 ], [ "ammo_300blk", 1 ] ],
+ "components": [
+ [ [ "gunpowder", 4 ], [ "gunpowder_magnum_pistol", 4 ], [ "gunpowder_rifle", 4 ] ],
+ [ [ "copper", 2 ] ]
+ ]
+ }
+]