Aftershock: Add some more Cyberpunk style gear

data/mods/Aftershock/items/armor/cyberpunk.json

@@ -22,5 +22,253 @@
     "color": "red",
     "material_thickness": 0.3,
     "pocket_data": [  ]
+  },
+  {
+    "id": "afs_lx_shirt",
+    "type": "ARMOR",
+    "name": { "str": "nanoweave formal shirt" },
+    "description": "A luxurious Lausanne dress shirt. Light grey fading into golden thread, it has a mandarin collar and a neo-deco look that was the rage back on Earth when you last left.",
+    "weight": "250 g",
+    "volume": "750 ml",
+    "price": "880 USD",
+    "material": [ "graphene_weave" ],
+    "symbol": "[",
+    "looks_like": "longshirt",
+    "color": "yellow",
+    "warmth": 10,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SUPER_FANCY" ],
+    "armor": [ { "encumbrance": 3, "coverage": 90, "covers": [ "torso", "arm_l", "arm_r" ] } ]
+  },
+  {
+    "id": "afs_lx_dress",
+    "type": "ARMOR",
+    "name": { "str": "nanoweave dress" },
+    "description": "A luxurious Lausanne cocktail dress.  White with gold thread accents, it has a neo-deco look that was the rage back on Earth when you last left.",
+    "weight": "800 g",
+    "volume": "3 L",
+    "price": "4 kUSD",
+    "price_postapoc": "16 kUSD",
+    "material": [ "graphene_weave" ],
+    "symbol": "[",
+    "looks_like": "dress",
+    "color": "yellow",
+    "warmth": 10,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SUPER_FANCY" ],
+    "armor": [ { "encumbrance": 3, "coverage": 75, "covers": [ "torso", "leg_l", "leg_r" ] } ]
+  },
+  {
+    "id": "afs_leather_jacket",
+    "repairs_like": "coat_rain",
+    "type": "ARMOR",
+    "copy-from": "jacket_leather",
+    "looks_like": "jacket_leather",
+    "name": { "str": "synleather jacket" },
+    "price": "350 USD",
+    "description": "A thick, heavy jacket made from synthetic leather.  Grants an elusively retro look.",
+    "material": [ "nylon" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "442 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 150,
+        "description": "Velcro-fastened internal pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "114 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "9 cm",
+        "moves": 120,
+        "description": "Zip-up left sleeve pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1176 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "30 cm",
+        "moves": 350,
+        "description": "rear channel pocket."
+      }
+    ]
+  },
+  {
+    "id": "afs_cyberpunk_bomber",
+    "repairs_like": "coat_rain",
+    "type": "ARMOR",
+    "copy-from": "jacket_leather",
+    "looks_like": "jacket_leather",
+    "name": { "str": "diode bomber" },
+    "description": "LED strips run along the interior of this synthetic jacket, ensuring you'll light up every room you enter.  Every mercenary around probably owns or has owned one of these.",
+    "material": [ "nylon" ],
+    "price": "490 USD",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "442 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 150,
+        "description": "Velcro-fastened internal pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "442 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 150,
+        "description": "Velcro-fastened internal pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "114 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "9 cm",
+        "moves": 120,
+        "description": "Zip-up left sleeve pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1176 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "30 cm",
+        "moves": 350,
+        "description": "rear channel pocket."
+      }
+    ]
+  },
+  {
+    "id": "afs_bolero",
+    "repairs_like": "coat_rain",
+    "type": "ARMOR",
+    "copy-from": "jacket_leather",
+    "looks_like": "jacket_leather",
+    "name": { "str": "mercenary bolero" },
+    "description": "A combat jacket with a high collar and a short waist.  Although it's made from reactive aramid fibers, it's more of a fashion statement than a practical piece of armor.  You could mount MOLLE compatible gear on it alongside a neck guard.",
+    "price": "490 USD",
+    "use_action": [ { "type": "attach_molle", "size": 4 }, { "type": "detach_molle" } ],
+    "material": [ "kevlar_layered" ],
+    "armor": [
+      {
+        "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1 } ],
+        "encumbrance": [ 3, 6 ],
+        "coverage": 80,
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_upper" ]
+      },
+      {
+        "material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 3 } ],
+        "encumbrance": 5,
+        "coverage": 90,
+        "cover_vitals": 90,
+        "covers": [ "arm_l", "arm_r" ]
+      }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "812 ml",
+        "max_contains_weight": "2500 g",
+        "max_item_length": "16 cm",
+        "moves": 80,
+        "description": "Zip-up chest pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "114 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "9 cm",
+        "moves": 120,
+        "description": "Zip-up left sleeve pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "ablative": true,
+        "volume_encumber_modifier": 0,
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "800 g",
+        "max_item_length": "21 cm",
+        "moves": 800,
+        "description": "Attachment for a collar.",
+        "item_restriction": [ "iotv_neck_plate" ]
+      }
+    ],
+    "variants": [
+      {
+        "id": "generic",
+        "name": { "str": "mercenary bolero" },
+        "description": "It's subtle and assuming, with a strictly functionally cut.",
+        "color": "dark_gray",
+        "weight": 50,
+        "append": true
+      },
+      {
+        "id": "punk",
+        "name": { "str": "streetfighter bolero" },
+        "description": "It's aesthetically worn down and adorned with a variety of patches for causes you scantly remember.",
+        "color": "blue",
+        "weight": 20,
+        "append": true
+      },
+      {
+        "id": "military",
+        "name": { "str": "enforcer's bolero" },
+        "description": "It's black and cut in a style that vaguely resembles the armor of Wraitheon's capital assurance teams.",
+        "color": "dark_gray",
+        "weight": 5,
+        "append": true
+      },
+      {
+        "id": "designer",
+        "name": { "str": "Lausanne combat bolero" },
+        "description": "It's pearl white with gold thread accents.  A classic from the Lausanne combat collection.",
+        "color": "dark_gray",
+        "weight": 0,
+        "append": true
+      }
+    ]
   }
 ]

data/mods/Aftershock/items/armor/energy_shield.json

@@ -102,7 +102,7 @@
     "type": "TOOL_ARMOR",
     "name": { "str": "SHD-1k Riemann Shield Generator (active)", "str_pl": "SHD-1k Riemann Shield Generators (active)" },
     "copy-from": "afs_backpack_shieldgen",
-    "description": "A powerful shielding system salvaged from a pre-Discontinuity robotic warframe, crudely adapted for compatibility with biological hosts.  Powerful enough to withstand prolonged assault from anti-vehicle weaponry.",
+    "description": "This shield generator is active and maintaining a Riemann shield around its user.  It is capable of fully protecting its user during prolonged bursts of kinetic and energy attacks.  Standard issue for UICA breaching teams.\n\nIts high energy consumption and weight make it unsuitable for long-term use.  Powered with energy cartridges.",
     "//": "A hundred watts isnt much IRL, but this is powered with laser magazines, so theres an extra layer of abstraction here.",
     "power_draw": "1 kW",
     "revert_to": "afs_backpack_shieldgen",

data/mods/Aftershock/items/armor/headsets.json

@@ -0,0 +1,53 @@
+[
+  {
+    "id": "afs_combat_headset_off",
+    "type": "TOOL_ARMOR",
+    "category": "clothing",
+    "name": { "str": "tactical infovisor" },
+    "description": "An armored black headset that coalesces the feeds of several sensors into a single screen display.  It provides generalized assistance in combat, including targeting assistance for thrown and ranged weaponry, threat identification, conditional NV and thermal vision and protection against high intensity light sources.  It must be active to function.",
+    "weight": "170 g",
+    "volume": "750 ml",
+    "price": "7 kUSD",
+    "material": [ "vacuum_carbide" ],
+    "symbol": "[",
+    "looks_like": "glasses_safety",
+    "color": "light_gray",
+    "ammo": "battery",
+    "charges_per_use": 1,
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "flag_restriction": [ "BATTERY_LIGHT" ],
+        "default_magazine": "light_battery_cell"
+      }
+    ],
+    "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "eyes" ] } ],
+    "material_thickness": 1,
+    "environmental_protection": 15,
+    "flags": [ "MUNDANE", "OUTER", "PADDED" ]
+  },
+  {
+    "id": "afs_combat_headset",
+    "type": "TOOL_ARMOR",
+    "category": "clothing",
+    "copy-from": "afs_combat_headset_off",
+    "name": { "str": "tactical infovisor" },
+    "description": "An armored black headset that coalesces the feeds of several sensors into a single screen display.  It provides generalized assistance in combat, including targeting assistance for thrown and ranged weaponry, threat identification, conditional NV and thermal vision and protection against high intensity light sources.",
+    "relic_data": { "passive_effects": [ { "id": "nvg_great" }, { "id": "THERMAL_VISION_GOOD" }, { "id": "THERMAL_VISION_GOOD" } ] },
+    "power_draw": "310 mW",
+    "flags": [
+      "MUNDANE",
+      "ZOOM",
+      "WATCH",
+      "ALARMCLOCK",
+      "OUTER",
+      "STURDY",
+      "FLASH_PROTECTION",
+      "SUN_GLASSES",
+      "WATER_BREAK",
+      "PADDED",
+      "ELECTRONIC"
+    ]
+  }
+]

data/mods/Aftershock/items/armor/military_armor.json

@@ -1,4 +1,32 @@
 [
+  {
+    "id": "iotv_neck_plate",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "ballistic collar" },
+    "description": "Front and back nylon collar assemblies with armor inserts for neck protection.  Designed to be attached to heavy military body armor.",
+    "weight": "621 g",
+    "volume": "488 ml",
+    "price": "600 USD",
+    "price_postapoc": "600 USD",
+    "symbol": ",",
+    "material": [ "vacuum_carbide", "nylon" ],
+    "color": "dark_gray",
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "CANT_WEAR" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "nylon", "covered_by_mat": 100, "thickness": 1.0 },
+          { "type": "vacuum_carbide", "covered_by_mat": 100, "thickness": 2 }
+        ],
+        "encumbrance": 0,
+        "coverage": 30,
+        "covers": [ "head" ],
+        "specifically_covers": [ "head_throat", "head_nape" ],
+        "volume_encumber_modifier": 0
+      }
+    ]
+  },
   {
     "id": "afs_military_vest",
     "type": "ARMOR",

data/mods/Aftershock/items/comestibles/flesh.json

@@ -14,6 +14,31 @@
     "name": { "str_sp": "meat flakes" },
     "description": "Transparent thin hexagonal cuts of dried meat.  Conspicuously uniform in both looks and texture."
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "curry_meat",
+    "looks_like": "soup_meat",
+    "name": { "str_sp": "ramen" },
+    "conditional_names": [ { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "frontier ramen" } } ],
+    "weight": "262 g",
+    "color": "red",
+    "spoils_in": "5 days",
+    "container": "can_medium",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": 13,
+    "calories": 381,
+    "description": "Ramen's adaptability to dried and preserved ingredients make it a staple in the culinary landscapes of frontier outposts and shipping crews alike.  Any spaceport worth visiting has a local ramen tradition of its own, and here the dish is slightly acidic, with a sweet aftertaste produced by the break-down of alien proteins.",
+    "price": "14 USD",
+    "price_postapoc": "14 USD",
+    "material": [ { "type": "water", "portion": 50 }, { "type": "flesh", "portion": 25 }, { "type": "veggy", "portion": 25 } ],
+    "volume": "250 ml",
+    "phase": "liquid",
+    "charges": 1,
+    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
+    "vitamins": [ [ "vitC", 30 ], [ "calcium", 5 ], [ "iron", 28 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ],
+    "fun": 8
+  },
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",