diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-02-02 16:43:51 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-02-02 16:43:51 -0800 |
| commit | 6bd924a6320887576ca79cd93dcb99cc674e22a9 (patch) | |
| tree | 973440c3beaea7af6870a5b7f3fadc060bfdaa26 /json/recipes | |
| parent | Adding the name not required for copy-from martialarts (diff) | |
| download | cataclysm-dda-mod_hk-loadout-6bd924a6320887576ca79cd93dcb99cc674e22a9.tar.xz | |
Fix 000 shot ordering so as to not place types before their copy-froms.
Convert guns to use str_sp instead of str.
Convert ammo types and materials to arrays.
Various formatting changes to recipes to ease readability.
Fix factory loaded 000shot uncraft from providing less materials than a reloaded.
Diffstat (limited to 'json/recipes')
| -rw-r--r-- | json/recipes/000shot.json | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/json/recipes/000shot.json b/json/recipes/000shot.json index 298587d..799e35a 100644 --- a/json/recipes/000shot.json +++ b/json/recipes/000shot.json @@ -13,7 +13,9 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] + "components": [ + [ [ "gunpowder", 6 ] ] + ] }, { "result": "reloaded_shot_000_inc", @@ -29,7 +31,10 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ], [ [ "incendiary", 5 ] ] ] + "components": [ + [ [ "gunpowder", 5 ] ], + [ [ "incendiary", 5 ] ] + ] }, { "result": "reloaded_shot_000_flechette", @@ -45,7 +50,10 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_000_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ], [ [ "combatnail", 12 ] ] ] + "components": [ + [ [ "gunpowder", 6 ] ], + [ [ "combatnail", 12 ] ] + ] }, { "result": "reloaded_shot_000_slug", @@ -60,7 +68,9 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "reversible": true, - "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 24 ], [ "ammo_000_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] + "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 24 ], [ "ammo_000_shot", 1 ] ], + "components": [ + [ [ "gunpowder", 6 ] ] + ] } ] |