From 97a6f6a9a41541a84aac44a2fb376ebcb9a69715 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 12 Mar 2024 01:13:39 -0700
Subject: Re-order against base json to ease diffing. Also fix a few minor
 bugs.

---
 json/items/armor/helmets.json | 94 ++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 54 deletions(-)

(limited to 'json/items/armor/helmets.json')

diff --git a/json/items/armor/helmets.json b/json/items/armor/helmets.json
index 28e9dce..564a7eb 100644
--- a/json/items/armor/helmets.json
+++ b/json/items/armor/helmets.json
@@ -1,4 +1,42 @@
 [
+  {
+    "id": "helmet_army",
+    "copy-from": "helmet_army",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "army helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "//": "Fix the material from kevlar to rigid kevlar."
+  },
+  {
+    "id": "tac_fullhelmet",
+    "copy-from": "tac_fullhelmet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "tactical full helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "material_thickness": 8,
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 20 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 20 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 }
+    ],
+    "extend": { "flags": [ "WATERPROOF" ] },
+    "//": "Fix the material from kevlar to rigid kevlar.",
+    "//2": "Also buff the thickness to make it a viable option compared to the army helmet.",
+    "//3": "Also add WATERPROOF"
+  },
+  {
+    "id": "tac_helmet",
+    "copy-from": "tac_helmet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "tactical helmet" },
+    "material": [ "kevlar_rigid", "plastic" ],
+    "material_thickness": 8,
+    "//": "Fix the material from kevlar to rigid kevlar.",
+    "//2": "Also buff the thickness to make it a viable option compared to the army helmet."
+  },
   {
     "id": "helmet_survivor",
     "type": "ARMOR",
@@ -53,66 +91,14 @@
   },
   {
     "id": "helmet_sasurvivor",
+    "copy-from": "helmet_hsurvivor",
     "type": "ARMOR",
     "name": { "str": "superalloy survivor helmet" },
     "description": "A customized, heavily armored superalloy and Kevlar helmet, modified to provide maximum comfort and protection from harm.  All the added material has made it rather heavy.",
-    "weight": "2649 g",
-    "volume": "2500 ml",
-    "price": "0 cent",
-    "price_postapoc": "65 USD",
-    "to_hit": -1,
-    "bashing": 10,
     "material": [ "kevlar_rigid", "superalloy" ],
-    "symbol": "[",
-    "looks_like": "helmet_survivor",
     "color": "light_cyan",
-    "covers": [ "head" ],
-    "coverage": 100,
     "encumbrance": 35,
-    "warmth": 15,
-    "material_thickness": 8,
-    "environmental_protection": 5,
-    "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
-    "//": "Overwrite because I disagree with BN's balancing."
-  },
-
-  {
-    "id": "helmet_army",
-    "copy-from": "helmet_army",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "army helmet" },
-    "material": [ "kevlar_rigid", "plastic" ],
+    "proportional": { "weight": 0.6, "price_postapoc": 2 },
     "//": "Fix the material from kevlar to rigid kevlar."
-  },
-  {
-    "id": "tac_helmet",
-    "copy-from": "tac_helmet",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "tactical helmet" },
-    "material": [ "kevlar_rigid", "plastic" ],
-    "material_thickness": 8,
-    "//": "Fix the material from kevlar to rigid kevlar.",
-    "//2": "Also buff the thickness to make it a viable option compared to the army helmet."
-  },
-  {
-    "id": "tac_fullhelmet",
-    "copy-from": "tac_fullhelmet",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "tactical full helmet" },
-    "material": [ "kevlar_rigid", "plastic" ],
-    "material_thickness": 8,
-    "armor_portion_data": [
-      { "covers": [ "head" ], "coverage": 100, "encumbrance": 20 },
-      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 20 },
-      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 }
-    ],
-    "extend": { "flags": [ "WATERPROOF" ] },
-    "//": "Fix the material from kevlar to rigid kevlar.",
-    "//2": "Also buff the thickness to make it a viable option compared to the army helmet.",
-    "//3": "Also add WATERPROOF"
   }
 ]
-- 
cgit v1.2.1