summaryrefslogtreecommitdiff
path: root/json/recipes
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 20:41:01 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-03 20:41:01 -0700
commitb6bd64766aaa3081557d9cfcc85d7794f7282da4 (patch)
tree5090a195417c49998646887b628a967356681796 /json/recipes
parentRemove press tool from 000shot recipes as shot_forming requirement already in... (diff)
downloadcataclysm-dda-mod_hk-loadout-b6bd64766aaa3081557d9cfcc85d7794f7282da4.tar.xz
Updated for removal of specialized gunpowders from BN
Diffstat (limited to 'json/recipes')
-rw-r--r--json/recipes/000shot.json8
-rw-r--r--json/recipes/473.json2
2 files changed, 5 insertions, 5 deletions
diff --git a/json/recipes/000shot.json b/json/recipes/000shot.json
index 3b6118e..298587d 100644
--- a/json/recipes/000shot.json
+++ b/json/recipes/000shot.json
@@ -13,7 +13,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ],
- "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+ "components": [ [ [ "gunpowder", 6 ] ] ]
},
{
"result": "reloaded_shot_000_inc",
@@ -29,7 +29,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ],
- "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ], [ [ "incendiary", 5 ] ] ]
+ "components": [ [ [ "gunpowder", 5 ] ], [ [ "incendiary", 5 ] ] ]
},
{
"result": "reloaded_shot_000_flechette",
@@ -45,7 +45,7 @@
"charges": 1,
"reversible": true,
"using": [ [ "shot_forming", 1 ], [ "ammo_000_shot", 1 ] ],
- "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 12 ] ] ]
+ "components": [ [ [ "gunpowder", 6 ] ], [ [ "combatnail", 12 ] ] ]
},
{
"result": "reloaded_shot_000_slug",
@@ -61,6 +61,6 @@
"charges": 1,
"reversible": true,
"using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 24 ], [ "ammo_000_shot", 1 ] ],
- "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+ "components": [ [ [ "gunpowder", 6 ] ] ]
}
]
diff --git a/json/recipes/473.json b/json/recipes/473.json
index 42f7d47..19c764f 100644
--- a/json/recipes/473.json
+++ b/json/recipes/473.json
@@ -17,7 +17,7 @@
"components": [
[ [ "473mm_mold", 1 ] ],
[ [ "smrifle_primer", 1 ] ],
- [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ] ],
+ [ [ "gunpowder", 6 ] ],
[ [ "copper", 1 ] ]
]
},