From 6bd924a6320887576ca79cd93dcb99cc674e22a9 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 2 Feb 2022 16:43:51 -0800
Subject: 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.

---
 json/recipes/000shot.json | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'json/recipes')

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 ] ]
+    ]
   }
 ]
-- 
cgit v1.2.1