Add and fix more items, this time in tool_armor.

1 files changed, 242 insertions, 172 deletions

diff --git a/json/items/tool_armor.json b/json/items/tool_armor.json
index 9bca03a..feec4aa 100644
--- a/json/items/tool_armor.json
+++ b/json/items/tool_armor.json
@@ -1,5 +1,15 @@
 [
-  { 
+  {
+    "id": "holo_cloak",
+    "copy-from": "holo_cloak",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "hologram cloak" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "torso", "arms", "legs" ], "coverage": 70, "encumbrance": 10 }
+    ]
+  },
+  {
     "id": "survivor_light",
     "copy-from": "survivor_light",
     "type": "TOOL_ARMOR",
@@ -7,7 +17,7 @@
     "extend": { "flags": [ "COMPACT" ] },
     "//": "Add compact flag as the description makes clear it can be easily adjusted for comfort."
   },
-  { 
+  {
     "id": "survivor_light_on",
     "copy-from": "survivor_light_on",
     "type": "TOOL_ARMOR",
@@ -16,7 +26,7 @@
     "//": "Add compact flag as the description makes clear it can be easily adjusted for comfort.",
     "//2": "Append (on) to make explicit when these are turned on."
   },
-  { 
+  {
     "id": "wearable_atomic_light",
     "type": "TOOL_ARMOR",
     "category": "clothing",
@@ -78,39 +88,104 @@
     "//2": "Overwrite to fix use action flagging the covered mod as 'active'.",
     "//3": "Reduce volume to 750ml like the regular survivor headlamp."
   },
-  { 
-    "id": "goggles_nv",
-    "copy-from": "goggles_nv",
-    "type": "TOOL_ARMOR",
-    "name": { "str": "pair of light amp goggles", "str_pl": "pairs of light amp goggles" },
-    "extend": { "flags": [ "OUTER" ] },
-    "//": "Move to outer layer."
-  },
-  { 
-    "id": "goggles_nv_on",
-    "copy-from": "goggles_nv_on",
-    "type": "TOOL_ARMOR",
-    "name": { "str": "pair of light amp goggles (on)", "str_pl": "pairs of light amp goggles (on)" },
-    "extend": { "flags": [ "OUTER" ] },
-    "//": "Move to outer layer.",
-    "//2": "Append (on) to make explicit when these are turned on."
-  },
-  { 
-    "id": "goggles_ir",
-    "copy-from": "goggles_ir",
+  {
+    "id": "rm13_armor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "pair of infrared goggles", "str_pl": "pairs of infrared goggles" },
-    "extend": { "flags": [ "OUTER" ] },
-    "//": "Move to outer layer."
+    "category": "clothing",
+    "symbol": "[",
+    "color": "dark_gray",
+    "name": { "str": "RM13 combat armor" },
+    "description": "This full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology.  It has an internal microreactor as a power source.  Use it to turn it on.",
+    "flags": [
+      "VARSIZE",
+      "STURDY",
+      "WATERPROOF",
+      "RAINPROOF",
+      "WATCH",
+      "ALARMCLOCK",
+      "SWIM_GOGGLES",
+      "SUN_GLASSES",
+      "RAD_RESIST"
+      ],
+    "price": "500 kUSD",
+    "price_postapoc": "100 USD",
+    "material": [ "carbide", "kevlar" ],
+    "weight": "6820 g",
+    "volume": "9 L",
+    "to_hit": -3,
+    "charges_per_use": 1,
+    "max_charges": 5000,
+    "ammo": "plutonium",
+    "use_action": "RM13ARMOR_OFF",
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 10 }
+    ],
+    "warmth": 10,
+    "environmental_protection": 15,
+    "material_thickness": 4,
+    "//": "Overwrite to enable armor_portion_data. Game throws errors when trying to use copy-from to replace armor_portion_data with a different armor_portion_data."
   },
-  { 
-    "id": "goggles_ir_on",
-    "copy-from": "goggles_ir_on",
+  {
+    "id": "rm13_armor_on",
     "type": "TOOL_ARMOR",
-    "name": { "str": "pair of infrared goggles (on)", "str_pl": "pairs of infrared goggles (on)" },
-    "extend": { "flags": [ "OUTER" ] },
-    "//": "Move to outer layer.",
-    "//2": "Append (on) to make explicit when these are turned on."
+    "category": "clothing",
+    "symbol": "[",
+    "color": "dark_gray",
+    "name": { "str": "RM13 combat armor (on)", "str_pl": "RM13 combat armors (on)" },
+    "description": "This full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology.  It has an internal microreactor as a power source.  It is turned on, and continually draining power.  Use it to turn it off.",
+    "flags": [
+      "VARSIZE",
+      "STURDY",
+      "WATERPROOF",
+      "RAINPROOF",
+      "WATCH",
+      "ALARMCLOCK",
+      "SWIM_GOGGLES",
+      "SUN_GLASSES",
+      "RAD_PROOF",
+      "GAS_PROOF",
+      "ELECTRIC_IMMUNE",
+      "THERMOMETER",
+      "TRADER_AVOID",
+      "CLIMATE_CONTROL"
+    ],
+    "price": "500 kUSD",
+    "price_postapoc": "100 USD",
+    "material": [ "carbide", "kevlar" ],
+    "weight": "6820 g",
+    "volume": "9 L",
+    "to_hit": -3,
+    "charges_per_use": 0,
+    "turns_per_charge": 18,
+    "max_charges": 5000,
+    "ammo": "plutonium",
+    "revert_to": "rm13_armor",
+    "use_action": "RM13ARMOR_ON",
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "legs" ], "coverage": 100, "encumbrance": 3 },
+      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 3 }
+    ],
+    "warmth": 10,
+    "qualities": [ [ "GLARE", 2 ] ],
+    "environmental_protection": 40,
+    "material_thickness": 7,
+    "weight_capacity_bonus": "4774 g",
+    "//": "Overwrite to enable armor_portion_data. Game throws errors when trying to use copy-from to replace armor_portion_data with a different armor_portion_data.",
+    "//2": "Add weight capacity bonus. Encumbrance goes down by ~70% when active, so the apparent weight should too.",
+    "//3": "Add GASPROOF. The environmental_protection is so high it just makes sense to be immune."
   },
   {
     "id": "phase_immersion_suit",
@@ -218,150 +293,59 @@
     "//": "Overwrite to enable armor_portion_data. Game throws errors when trying to use copy-from to replace armor_portion_data with a different armor_portion_data."
   },
   {
-    "id": "rm13_armor",
+    "id": "mask_gas",
+    "copy-from": "mask_gas",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "symbol": "[",
-    "color": "dark_gray",
-    "name": { "str": "RM13 combat armor" },
-    "description": "This full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology.  It has an internal microreactor as a power source.  Use it to turn it on.",
-    "flags": [
-      "VARSIZE",
-      "STURDY",
-      "WATERPROOF",
-      "RAINPROOF",
-      "WATCH",
-      "ALARMCLOCK",
-      "SWIM_GOGGLES",
-      "SUN_GLASSES",
-      "RAD_RESIST"
-      ],
-    "price": "500000 USD",
-    "price_postapoc": "100 USD",
-    "material": [ "carbide", "kevlar" ],
-    "weight": "6820 g",
-    "volume": "9 L",
-    "to_hit": -3,
-    "charges_per_use": 1,
-    "max_charges": 5000,
-    "ammo": "plutonium",
-    "use_action": "RM13ARMOR_OFF",
+    "name": { "str": "gas mask" },
     "armor_portion_data": [
-      { "covers": [ "head" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 },
-      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 20 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 10, 15 ] },
-      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 10 }
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
     ],
-    "storage": "8 L",
-    "warmth": 10,
-    "environmental_protection": 15,
-    "material_thickness": 4,
-    "//": "Overwrite to enable armor_portion_data. Game throws errors when trying to use copy-from to replace armor_portion_data with a different armor_portion_data."
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "rm13_armor_on",
+    "id": "mask_gas_xl",
+    "copy-from": "mask_gas_xl",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "symbol": "[",
-    "color": "dark_gray",
-    "name": { "str": "RM13 combat armor (on)", "str_pl": "RM13 combat armors (on)" },
-    "description": "This full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology.  It has an internal microreactor as a power source.  It is turned on, and continually draining power.  Use it to turn it off.",
-    "flags": [
-      "VARSIZE",
-      "STURDY",
-      "WATERPROOF",
-      "RAINPROOF",
-      "WATCH",
-      "ALARMCLOCK",
-      "SWIM_GOGGLES",
-      "SUN_GLASSES",
-      "RAD_PROOF",
-      "GAS_PROOF",
-      "ELECTRIC_IMMUNE",
-      "THERMOMETER",
-      "TRADER_AVOID",
-      "CLIMATE_CONTROL"
-    ],
-    "price": "500000 USD",
-    "price_postapoc": "100 USD",
-    "material": [ "carbide", "kevlar" ],
-    "weight": "6820 g",
-    "volume": "9 L",
-    "to_hit": -3,
-    "charges_per_use": 0,
-    "turns_per_charge": 18,
-    "max_charges": 5000,
-    "ammo": "plutonium",
-    "revert_to": "rm13_armor",
-    "use_action": "RM13ARMOR_ON",
+    "name": { "str": "XL gas mask" },
     "armor_portion_data": [
-      { "covers": [ "head" ], "coverage": 100, "encumbrance": 3 },
-      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 },
-      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 3 },
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 3, 6 ] },
-      { "covers": [ "arms" ], "coverage": 100, "encumbrance": 3 },
-      { "covers": [ "hands" ], "coverage": 100, "encumbrance": 3 },
-      { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 3, 4 ] },
-      { "covers": [ "feet" ], "coverage": 100, "encumbrance": 3 }
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
     ],
-    "storage": "8 L",
-    "warmth": 10,
-    "qualities": [ [ "GLARE", 2 ] ],
-    "environmental_protection": 40,
-    "material_thickness": 7,
-    "weight_capacity_bonus": "4774 g",
-    "//": "Overwrite to enable armor_portion_data. Game throws errors when trying to use copy-from to replace armor_portion_data with a different armor_portion_data.",
-    "//2": "Add weight capacity bonus. Encumbrance goes down by ~70% when active, so the apparent weight should too.",
-    "//3": "Add GASPROOF. The environmental_protection is so high it just makes sense to be immune."
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "wearable_rx12",
-    "copy-from": "wearable_rx12",
+    "id": "mask_fsurvivor",
+    "copy-from": "mask_fsurvivor",
     "type": "TOOL_ARMOR",
-    "name": { "str": "RX12 medical delivery system" },
-    "description": "The Rivtech RX12 medical delivery system is a jet autoinjector system worn on the user's body.  A simple press of its activator injects advanced fast-healing chemicals into the bloodstream without using a needle.  A label on the side warns against using more than two doses per hour.",
-    "material": [ "superalloy", "kevlar" ],
-    "covers": [ "arm_either" ],
-    "coverage": 2,
-    "encumbrance": 1,
-    "material_thickness": 1,
-    "flags": [ "WATER_FRIENDLY", "SKINTIGHT", "FRAGILE", "COMPACT" ],
-    "//": "Fix the materials.",
-    "//2": "Rename and redescribe to standarize with the RX11.",
-    "//3": "Convert to an actual worn item."
-  },
-  {
-    "id": "rx11_stimpack",
-    "copy-from": "rx11_stimpack",
-    "type": "TOOL_ARMOR",
-    "name": { "str": "RX11 stimulant delivery system" },
-    "material": [ "superalloy", "kevlar" ],
-    "covers": [ "arm_either" ],
-    "coverage": 2,
-    "encumbrance": 1,
-    "material_thickness": 1,
-    "flags": [ "WATER_FRIENDLY", "SKINTIGHT", "FRAGILE", "COMPACT" ],
-    "//": "Fix the materials.",
-    "//2": "Convert to an actual worn item."
+    "category": "clothing",
+    "name": { "str": "survivor firemask" },
+    "armor_portion_data": [
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
+    ],
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "powered_earmuffs_on",
-    "copy-from": "powered_earmuffs_on",
+    "id": "mask_bunker",
+    "copy-from": "mask_bunker",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "name": { "str_sp": "shooter's earmuffs (on)" },
-    "//": "Append (on) to make explicit when these are turned on."
+    "name": { "str": "firefighter PBA mask" },
+    "armor_portion_data": [
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 20 }
+    ],
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "mask_gas",
-    "copy-from": "mask_gas",
+    "id": "mask_hsurvivor",
+    "copy-from": "mask_hsurvivor",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "name": { "str": "gas mask" },
+    "name": { "str": "heavy survivor mask" },
     "armor_portion_data": [
       { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
       { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
@@ -369,14 +353,14 @@
     "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "mask_bunker",
-    "copy-from": "mask_bunker",
+    "id": "mask_sasurvivor",
+    "copy-from": "mask_sasurvivor",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "name": { "str": "firefighter PBA mask" },
+    "name": { "str": "superalloy survivor mask" },
     "armor_portion_data": [
       { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 20 }
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 25 }
     ],
     "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
@@ -405,11 +389,11 @@
     "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "mask_hsurvivor",
-    "copy-from": "mask_hsurvivor",
+    "id": "mask_wsurvivor",
+    "copy-from": "mask_wsurvivor",
     "type": "TOOL_ARMOR",
     "category": "clothing",
-    "name": { "str": "heavy survivor mask" },
+    "name": { "str": "winter survivor mask" },
     "armor_portion_data": [
       { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
       { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
@@ -417,16 +401,68 @@
     "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   },
   {
-    "id": "mask_sasurvivor",
-    "copy-from": "mask_sasurvivor",
+    "id": "goggles_nv",
+    "copy-from": "goggles_nv",
     "type": "TOOL_ARMOR",
-    "category": "clothing",
-    "name": { "str": "superalloy survivor mask" },
-    "armor_portion_data": [
-      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
-      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 25 }
-    ],
-    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
+    "name": { "str": "pair of light amp goggles", "str_pl": "pairs of light amp goggles" },
+    "extend": { "flags": [ "OUTER" ] },
+    "//": "Move to outer layer."
+  },
+  {
+    "id": "goggles_nv_on",
+    "copy-from": "goggles_nv_on",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "pair of light amp goggles (on)", "str_pl": "pairs of light amp goggles (on)" },
+    "extend": { "flags": [ "OUTER" ] },
+    "//": "Move to outer layer.",
+    "//2": "Append (on) to make explicit when these are turned on."
+  },
+  {
+    "id": "goggles_ir",
+    "copy-from": "goggles_ir",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "pair of infrared goggles", "str_pl": "pairs of infrared goggles" },
+    "extend": { "flags": [ "OUTER" ] },
+    "//": "Move to outer layer."
+  },
+  {
+    "id": "goggles_ir_on",
+    "copy-from": "goggles_ir_on",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "pair of infrared goggles (on)", "str_pl": "pairs of infrared goggles (on)" },
+    "extend": { "flags": [ "OUTER" ] },
+    "//": "Move to outer layer.",
+    "//2": "Append (on) to make explicit when these are turned on."
+  },
+  {
+    "id": "wearable_rx12",
+    "copy-from": "wearable_rx12",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "RX12 medical delivery system" },
+    "description": "The Rivtech RX12 medical delivery system is a jet autoinjector system worn on the user's body.  A simple press of its activator injects advanced fast-healing chemicals into the bloodstream without using a needle.  A label on the side warns against using more than two doses per hour.",
+    "material": [ "superalloy", "kevlar" ],
+    "covers": [ "arm_either" ],
+    "coverage": 2,
+    "encumbrance": 1,
+    "material_thickness": 1,
+    "flags": [ "WATER_FRIENDLY", "SKINTIGHT", "FRAGILE", "COMPACT" ],
+    "//": "Fix the materials.",
+    "//2": "Rename and redescribe to standarize with the RX11.",
+    "//3": "Convert to an actual worn item."
+  },
+  {
+    "id": "rx11_stimpack",
+    "copy-from": "rx11_stimpack",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "RX11 stimulant delivery system" },
+    "material": [ "superalloy", "kevlar" ],
+    "covers": [ "arm_either" ],
+    "coverage": 2,
+    "encumbrance": 1,
+    "material_thickness": 1,
+    "flags": [ "WATER_FRIENDLY", "SKINTIGHT", "FRAGILE", "COMPACT" ],
+    "//": "Fix the materials.",
+    "//2": "Convert to an actual worn item."
   },
   {
     "id": "mask_h20survivor",
@@ -439,5 +475,39 @@
       { "covers": [ "mouth" ], "coverage": 75, "encumbrance": 30 }
     ],
     "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
+  },
+  {
+    "id": "powered_earmuffs_on",
+    "copy-from": "powered_earmuffs_on",
+    "type": "TOOL_ARMOR",
+    "category": "clothing",
+    "name": { "str_sp": "shooter's earmuffs (on)" },
+    "//": "Append (on) to make explicit when these are turned on."
+  },
+  {
+    "id": "helmet_riot",
+    "copy-from": "helmet_riot",
+    "type": "TOOL_ARMOR",
+    "category": "clothing",
+    "name": { "str": "riot helmet" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 95, "encumbrance": 20 },
+      { "covers": [ "eyes" ], "coverage": 95, "encumbrance": 5 },
+      { "covers": [ "mouth" ], "coverage": 95, "encumbrance": 20 }
+    ],
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
+  },
+  {
+    "id": "foodperson_mask",
+    "copy-from": "foodperson_mask",
+    "type": "TOOL_ARMOR",
+    "category": "clothing",
+    "name": { "str": "Foodperson mask" },
+    "armor_portion_data": [
+      { "covers": [ "head" ], "coverage": 100, "encumbrance": 30 },
+      { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 10 },
+      { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 30 }
+    ],
+    "//": "Replace generic armor coverage with armor_portion_data. No more crippled vision with gas masks."
   }
 ]