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.

2 files changed, 37 insertions, 38 deletions

diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index 1f227eb..7b9dde7 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -1,41 +1,5 @@
 [
   {
-    "id": "reloaded_shot_000",
-    "copy-from": "shot_000",
-    "type": "AMMO",
-    "name": { "str": "000 shot, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_flechette",
-    "copy-from": "shot_000_flechette",
-    "type": "AMMO",
-    "name": { "str": "000 flechette shell, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_slug",
-    "copy-from": "shot_000_slug",
-    "type": "AMMO",
-    "name": { "str": "000 shotgun slug, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_inc",
-    "copy-from": "shot_000_inc",
-    "type": "AMMO",
-    "name": { "str": "000 incendiary shell, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "shot_000",
     "type": "AMMO",
     "looks_like": "shot_00",
@@ -121,5 +85,41 @@
     "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
     "delete": { "effects": [ "SHOT" ] },
     "extend": { "effects": [ "EXPLOSIVE_TINY" ] }
+  },
+  {
+    "id": "reloaded_shot_000",
+    "copy-from": "shot_000",
+    "type": "AMMO",
+    "name": { "str": "000 shot, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_shot_000_flechette",
+    "copy-from": "shot_000_flechette",
+    "type": "AMMO",
+    "name": { "str": "000 flechette shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_shot_000_slug",
+    "copy-from": "shot_000_slug",
+    "type": "AMMO",
+    "name": { "str": "000 shotgun slug, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_shot_000_inc",
+    "copy-from": "shot_000_inc",
+    "type": "AMMO",
+    "name": { "str": "000 incendiary shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/46.json b/json/items/ammo/46.json
index 859f275..e0dd5a7 100644
--- a/json/items/ammo/46.json
+++ b/json/items/ammo/46.json
@@ -5,7 +5,7 @@
     "name": { "str": "4.6x30mm DM11" },
     "description": "4.6x30mm ammunition with 31gr copper plated steel bullets. The Ultimate Combat DM11 Penetrator round has low recoil and excellent armor penetration.",
     "weight": "6500 mg",
-    "volume": "250 ml",
+    "volume": "156 ml",
     "price": 300,
     "price_postapoc": 1600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -17,7 +17,6 @@
     "ammo_type": "46",
     "casing": "46mm_casing",
     "range": 14,
-    "//": "Base damage of 20, balance increase of one third.",
     "damage": { "damage_type": "stab", "amount": 24, "armor_penetration": 24 },
     "dispersion": 40,
     "recoil": 90,