Make more things made out of nylon

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -129,7 +129,7 @@
     "//": "Standard (non-winter) set of clothes worn by soldiers and paramilitary forces.",
     "items": [
       { "group": "clothing_soldier_shirt" },
-      { "item": "jacket_army" },
+      { "distribution": [ { "item": "jacket_army_modern", "prob": 50 }, { "item": "combat_shirt", "prob": 50 } ] },
       { "item": "pants_army" },
       { "item": "webbing_belt" },
       { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] },
@@ -224,7 +224,7 @@
     "subtype": "collection",
     "//": "Standard set of clothes worn by a military helicopter pilot.",
     "items": [
-      { "item": "jacket_army", "prob": 40 },
+      { "item": "chestrig", "prob": 40 },
       { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] },
       { "item": "mil_flight_suit", "prob": 80 },
       { "item": "nomex_gloves" },
@@ -1782,6 +1782,8 @@
       { "item": "boots_combat", "prob": 10 },
       { "item": "pants_army", "prob": 10 },
       { "item": "jacket_army", "prob": 10 },
+      { "item": "jacket_army_modern", "prob": 2 },
+      { "item": "combat_shirt", "prob": 2 },
       { "item": "winter_pants_army", "prob": 10 },
       { "item": "winter_jacket_army", "prob": 10 },
       { "item": "winter_gloves_army", "prob": 10 },
@@ -1946,7 +1948,8 @@
     "id": "mil_armor",
     "items": [
       [ "pants_army", 10 ],
-      [ "jacket_army", 10 ],
+      [ "jacket_army_modern", 5 ],
+      [ "jacket_army_modern", 5 ],
       [ "winter_pants_army", 30 ],
       [ "winter_jacket_army", 30 ],
       [ "winter_gloves_army", 30 ],
@@ -2077,7 +2080,9 @@
       [ "pants_cargo", 70 ],
       [ "shorts_cargo", 50 ],
       [ "pants_army", 30 ],
-      [ "jacket_army", 30 ],
+      [ "jacket_army", 6 ],
+      [ "combat_shirt", 6 ],
+      [ "jacket_army_modern", 18 ],
       [ "winter_pants_army", 10 ],
       [ "winter_jacket_army", 10 ],
       [ "winter_gloves_army", 10 ],
@@ -2299,7 +2304,9 @@
       [ "sleeveless_duster_survivor", 2 ],
       [ "vest", 40 ],
       [ "kevlar", 16 ],
-      [ "jacket_army", 28 ],
+      [ "jacket_army", 5 ],
+      [ "jacket_army_modern", 16 ],
+      [ "combat_shirt", 5 ],
       [ "trenchcoat", 12 ],
       [ "trenchcoat_leather", 10 ],
       [ "trenchcoat_fur", 5 ],

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -2398,7 +2398,10 @@
     "subtype": "collection",
     "items": [
       { "group": "clothing_soldier_shirt" },
-      { "item": "jacket_army", "prob": 50 },
+      {
+        "distribution": [ { "item": "combat_shirt", "prob": 50 }, { "item": "jacket_army_modern", "prob": 50 } ],
+        "prob": 50
+      },
       { "item": "elbow_pads", "prob": 10 },
       { "item": "pants_army", "prob": 75 },
       { "item": "webbing_belt", "prob": 50 },
@@ -2461,7 +2464,11 @@
         "prob": 80
       },
       {
-        "distribution": [ { "item": "jacket_army", "prob": 80 }, { "item": "winter_jacket_army", "prob": 20 } ],
+        "distribution": [
+          { "item": "combat_shirt", "prob": 40 },
+          { "item": "jacket_army_modern", "prob": 40 },
+          { "item": "winter_jacket_army", "prob": 20 }
+        ],
         "prob": 100
       }
     ]

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -710,6 +710,7 @@
       [ "emer_blanket", 20 ],
       [ "flyer", 10 ],
       [ "helmet_liner", 20 ],
+      [ "jacket_army", 40 ],
       [ "pur_tablets", 10 ],
       [ "knife_trench", 14 ],
       [ "flaregun", 20 ],

data/json/itemgroups/military.json

@@ -319,7 +319,8 @@
       { "item": "mil_flight_suit", "prob": 30 },
       { "item": "combo_cover", "prob": 20 },
       { "item": "pants_army", "prob": 70 },
-      { "item": "jacket_army", "prob": 70 },
+      { "item": "combat_shirt", "prob": 35 },
+      { "item": "jacket_army_modern", "prob": 35 },
       { "item": "socks", "prob": 40 },
       { "item": "winter_pants_army", "prob": 20 },
       { "item": "winter_jacket_army", "prob": 20 },
@@ -536,7 +537,8 @@
       { "item": "pants_army", "prob": 30 },
       { "item": "flight_helmet", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "mil_flight_suit", "prob": 30 },
-      { "item": "jacket_army", "prob": 30 },
+      { "item": "combat_shirt", "prob": 15 },
+      { "item": "jacket_army_modern", "prob": 15 },
       { "item": "winter_pants_army", "prob": 10 },
       { "item": "winter_jacket_army", "prob": 10 },
       { "item": "winter_gloves_army", "prob": 10 },

data/json/itemgroups/misc.json

@@ -127,7 +127,7 @@
       { "item": "duffelbag" },
       { "item": "backpack" },
       { "item": "helmet_army" },
-      { "item": "jacket_army" },
+      { "item": "jacket_army_modern" },
       { "item": "pants_army" },
       { "item": "tshirt", "count": 3 },
       { "item": "under_armor" },

data/json/items/armor/bandolier.json

@@ -199,7 +199,7 @@
     "volume": "250 ml",
     "price": 5900,
     "price_postapoc": 750,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "ammo_satchel",
     "color": "dark_gray",
@@ -237,7 +237,7 @@
     "volume": "1250 ml",
     "price": 3000,
     "price_postapoc": 1250,
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "leather_belt",
     "color": "dark_gray",

data/json/items/armor/coats.json

@@ -743,7 +743,7 @@
     "repairs_like": "trenchcoat",
     "type": "ARMOR",
     "name": { "str_sp": "army jacket" },
-    "description": "A tough jacket with lots of pockets.  Favored by the military.",
+    "description": "A vintage army jacket, or at least a copy of one, with lots of pockets.  Favored by the military.",
     "weight": "780 g",
     "volume": "3 L",
     "price": 3500,
@@ -805,6 +805,65 @@
     "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
+  {
+    "id": "jacket_army_modern",
+    "type": "ARMOR",
+    "name": { "str_sp": "combat blouse" },
+    "description": "A sleek blouse in a camouflage pattern with angled breast pockets and lots of loop velcro for affixing patches.  You might call it a jacket but it's really a blouse.  It has a pocket for your pen!",
+    "weight": "650 g",
+    "volume": "3 L",
+    "price": 6400,
+    "price_postapoc": 750,
+    "material": [ "nylon", "cotton" ],
+    "symbol": "[",
+    "looks_like": "jacket_army",
+    "color": "green",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 7, 9 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 9 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "900 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 70
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "900 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 70
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "10 ml",
+        "max_contains_weight": "50 g",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
+    "warmth": 20,
+    "material_thickness": 0.4,
+    "valid_mods": [ "steel_padded" ],
+    "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
+  },
   {
     "id": "jacket_chef",
     "repairs_like": "trenchcoat",

data/json/items/armor/storage.json

@@ -8,7 +8,7 @@
     "volume": "2 L",
     "price": 3900,
     "price_postapoc": 500,
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "ragpouch",
     "color": "green",
@@ -105,7 +105,7 @@
     "volume": "9186 ml",
     "price": 4500,
     "price_postapoc": 750,
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "backpack",
     "color": "green",
@@ -417,7 +417,7 @@
     "//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55",
     "price": 5500,
     "price_postapoc": 500,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "material_thickness": 1,
     "pocket_data": [
       {
@@ -528,7 +528,7 @@
     "price": 3500,
     "to_hit": 2,
     "bashing": 1,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "holster",
     "color": "green",
@@ -556,7 +556,7 @@
     "volume": "45 L",
     "price": 800,
     "price_postapoc": 750,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "quiver_large",
     "color": "green",
@@ -727,7 +727,7 @@
     "volume": "1050 ml",
     "price": 3000,
     "price_postapoc": 250,
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "color": "dark_gray",
     "pocket_data": [
@@ -761,7 +761,7 @@
     "volume": "550 ml",
     "price": 3000,
     "price_postapoc": 250,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "armguard_soft",
     "color": "dark_gray",
@@ -848,7 +848,7 @@
     "price_postapoc": 250,
     "to_hit": 1,
     "bashing": 1,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "purse",
     "color": "green",
@@ -876,7 +876,7 @@
     "volume": "5000 ml",
     "price": 6700,
     "price_postapoc": 1500,
-    "material": [ "cotton", "nylon" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "backpack",
     "color": "green",
@@ -953,7 +953,7 @@
     "volume": "36750 ml",
     "price": 7900,
     "price_postapoc": 250,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "backpack",
     "color": "blue",
@@ -1062,7 +1062,7 @@
     "volume": "11 L",
     "price": 9200,
     "price_postapoc": 1250,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "backpack",
     "color": "green",
@@ -1148,7 +1148,7 @@
     "price": 2900,
     "price_postapoc": 750,
     "bashing": 1,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "purse",
     "color": "green",
@@ -1295,7 +1295,7 @@
     "volume": "5 L",
     "price": 7000,
     "price_postapoc": 1500,
-    "material": [ "cotton" ],
+    "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "backpack",
     "color": "yellow",
@@ -1687,7 +1687,7 @@
     "price": 5500,
     "price_postapoc": 700,
     "bashing": 1,
-    "material": [ "cotton", "plastic" ],
+    "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "slingpack",
     "color": "yellow",

data/json/items/armor/torso_clothes.json

@@ -93,6 +93,51 @@
     "valid_mods": [ "steel_padded" ],
     "flags": [ "VARSIZE", "FANCY", "OUTER" ]
   },
+  {
+    "id": "combat_shirt",
+    "repairs_like": "jacket_army_modern",
+    "type": "ARMOR",
+    "name": { "str_sp": "combat shirt" },
+    "description": "An oddly balanced long-sleeved shirt with a thin, moisture wicking torso and thicker arms more appropriate for a jacket.  The arms are covered in a camouflage pattern and have two shoulder pockets.  It has a pocket for your pen!",
+    "weight": "450 g",
+    "volume": "3 L",
+    "price": 6400,
+    "price_postapoc": 750,
+    "material": [ "nylon", "cotton" ],
+    "symbol": "[",
+    "looks_like": "jacket_army",
+    "color": "green",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 95, "encumbrance": 3 },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 7, 9 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "10 ml",
+        "max_contains_weight": "50 g",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
+    "warmth": 5,
+    "material_thickness": 0.3,
+    "flags": [ "VARSIZE", "POCKETS" ]
+  },
   {
     "id": "dress",
     "repairs_like": "jeans",