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.

6 files changed, 20 insertions, 20 deletions

diff --git a/json/items/magazine/000shot.json b/json/items/magazine/000shot.json
index ad60008..1a06b6e 100644
--- a/json/items/magazine/000shot.json
+++ b/json/items/magazine/000shot.json
@@ -9,10 +9,10 @@
     "volume": "500 ml",
     "price": 30000,
     "price_postapoc": 175,
-    "material": "plastic",
+    "material": [ "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
-    "ammo_type": "000shot",
+    "ammo_type": [ "000shot" ],
     "capacity": 10,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
@@ -27,10 +27,10 @@
     "volume": "500 ml",
     "price": 30000,
     "price_postapoc": 175,
-    "material": "copper",
+    "material": [ "copper" ],
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "000shot",
+    "ammo_type": [ "000shot" ],
     "capacity": 20,
     "reliability": 6,
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 2 },
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
index 39cb92c..e54d4a1 100644
--- a/json/items/magazine/223.json
+++ b/json/items/magazine/223.json
@@ -6,9 +6,9 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K G36 30-round magazine" },
     "weight": "127 g", 
-    "material": "plastic",
+    "material": [ "plastic" ],
     "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
-    "ammo_type": "223",
+    "ammo_type": [ "223" ],
     "reliability": 9
   },
   {
@@ -18,6 +18,6 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K G36 100-round double drum magazine" },
     "description": "A bulky 100-round double drum magazine for use with the H&K G36 assault rifle.",
-    "ammo_type": "223"
+    "ammo_type": [ "223" ]
   }
 ]
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index 4c7d225..8f39489 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -30,10 +30,10 @@
     "volume": "250 ml",
     "price": 4500,
     "price_postapoc": 90,
-    "material": "aluminum",
+    "material": [ "aluminum" ],
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "308",
+    "ammo_type": [ "308" ],
     "capacity": 10,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index 340b82a..c0ee22a 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -5,7 +5,7 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K USP .40 magazine" },
     "description": "A standard capacity magazine for use with the Heckler & Koch USP .40 handgun.",
-    "ammo_type": "40",
+    "ammo_type": [ "40" ],
     "capacity": 13
   }
 ]
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json
index f6f22e9..856a12f 100644
--- a/json/items/magazine/46.json
+++ b/json/items/magazine/46.json
@@ -1,5 +1,14 @@
 [
   {
+    "id": "hk46mag",
+    "looks_like": "mp5mag",
+    "copy-from": "hk46mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K 4.6mm magazine" },
+    "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
+    "weight": "100 g"
+  },
+  {
     "id": "hk46bigmag",
     "looks_like": "mp5mag",
     "copy-from": "hk46bigmag",
@@ -20,14 +29,5 @@
     "price": 5500,
     "price_postapoc": 300,
     "capacity": 30
-  },
-  {
-    "id": "hk46mag",
-    "looks_like": "mp5mag",
-    "copy-from": "hk46mag",
-    "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm magazine" },
-    "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
-    "weight": "100 g"
   }
 ]
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 916d3c9..94a53b0 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -12,7 +12,7 @@
     "material": [ "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
-    "ammo_type": "473",
+    "ammo_type": [ "473" ],
     "capacity": 50,
     "reliability": 10,
     "reload_time": 50,