Re-order against base json to ease diffing.

Also fix a few minor bugs.

1 files changed, 71 insertions, 70 deletions

diff --git a/json/items/armor/coats.json b/json/items/armor/coats.json
index 6a7444f..8ae1b79 100644
--- a/json/items/armor/coats.json
+++ b/json/items/armor/coats.json
@@ -1,5 +1,64 @@
 [
   {
+    "id": "coat_lab",
+    "copy-from": "coat_lab",
+    "type": "ARMOR",
+    "name": { "str": "lab coat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 2, 5 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 2, 2 ] }
+    ],
+    "storage": "4 L"
+  },
+  {
+    "id": "coat_winter",
+    "copy-from": "coat_winter",
+    "type": "ARMOR",
+    "name": { "str": "winter coat" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] }
+    ],
+    "storage": "4 L"
+  },
+  {
+    "id": "duster",
+    "copy-from": "duster",
+    "type": "ARMOR",
+    "name": { "str": "duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
+    ],
+    "storage": "6600 ml"
+  },
+  {
+    "id": "duster_leather",
+    "copy-from": "duster_leather",
+    "type": "ARMOR",
+    "name": { "str": "leather duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
+    ],
+    "storage": "6600 ml"
+  },
+  {
+    "id": "duster_survivor",
+    "copy-from": "duster_survivor",
+    "type": "ARMOR",
+    "name": { "str": "survivor duster" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] },
+      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 5, 6 ] }
+    ],
+    "material_thickness": 4,
+    "storage": "8600 ml"
+  },
+  {
     "id": "greatcoat",
     "copy-from": "greatcoat",
     "type": "ARMOR",
@@ -11,6 +70,18 @@
     ]
   },
   {
+    "id": "jacket_army",
+    "copy-from": "jacket_army",
+    "type": "ARMOR",
+    "name": { "str": "army jacket" },
+    "armor_portion_data": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
+    "storage": "5 L",
+    "//": "Fix incorrect vanilla use of str_sp."
+  },
+  {
     "id": "jacket_leather",
     "copy-from": "jacket_leather",
     "type": "ARMOR",
@@ -74,65 +145,6 @@
     "storage": "8600 ml"
   },
   {
-    "id": "coat_winter",
-    "copy-from": "coat_winter",
-    "type": "ARMOR",
-    "name": { "str": "winter coat" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] }
-    ],
-    "storage": "4 L"
-  },
-  {
-    "id": "duster",
-    "copy-from": "duster",
-    "type": "ARMOR",
-    "name": { "str": "duster" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
-      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
-    ],
-    "storage": "6600 ml"
-  },
-  {
-    "id": "duster_leather",
-    "copy-from": "duster_leather",
-    "type": "ARMOR",
-    "name": { "str": "leather duster" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
-      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] }
-    ],
-    "storage": "6600 ml"
-  },
-  {
-    "id": "duster_survivor",
-    "copy-from": "duster_survivor",
-    "type": "ARMOR",
-    "name": { "str": "survivor duster" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] },
-      { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 5, 6 ] }
-    ],
-    "material_thickness": 4,
-    "storage": "8600 ml"
-  },
-  {
-    "id": "jacket_army",
-    "copy-from": "jacket_army",
-    "type": "ARMOR",
-    "name": { "str": "army jacket" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
-    ],
-    "storage": "5 L"
-  },
-  {
     "id": "winter_jacket_army",
     "copy-from": "winter_jacket_army",
     "type": "ARMOR",
@@ -142,16 +154,5 @@
       { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] }
     ],
     "storage": "5 L"
-  },
-  {
-    "id": "coat_lab",
-    "copy-from": "coat_lab",
-    "type": "ARMOR",
-    "name": { "str": "lab coat" },
-    "armor_portion_data": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 2, 5 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 2, 2 ] }
-    ],
-    "storage": "4 L"
   }
 ]