Adding tactical jackets (CleverRaven#69961)

* Update coats.json * Update coats.json * added camo variants * Update clothing.json * Update collections_domestic.json * Update locations_commercial.json * Update mansion.json * fix format error * Update mansion.json * lint * lint2 * lint3 * lint4 * tactical colors * Update clothing.json * Update clothing.json * Update clothing.json * Update locations_commercial.json * Update mansion.json * Update collections_domestic.json * Update coats.json * Update coats.json * Update coats.json
OldFriendEr · Dec 8, 2023 · 308198d · 308198d
1 parent 0ae081a
commit 308198d
Show file tree

Hide file tree

Showing 5 changed files with 172 additions and 0 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -98,6 +98,7 @@
       { "item": "gloves_wool", "prob": 50 },
       { "item": "knit_scarf", "prob": 50 },
       { "item": "pants_cargo", "prob": 75 },
+      { "item": "tacjacket", "prob": 75 },
       { "item": "socks_wool", "prob": 50 },
       { "item": "coat_winter", "prob": 50 },
       { "item": "greatcoat", "prob": 25 },
@@ -542,6 +543,7 @@
               { "item": "hoodie", "prob": 60 },
               { "item": "jacket_jean", "prob": 20 },
               { "item": "jacket_leather", "prob": 20 },
+              { "item": "tacjacket", "prob": 30 },
               { "item": "leather_police_jacket", "prob": 15 },
               { "item": "jacket_light", "prob": 40 },
               { "item": "jacket_windbreaker", "prob": 20 },
@@ -1550,6 +1552,7 @@
       [ "blazer", 35 ],
       [ "towel", 40 ],
       [ "jacket_leather", 30 ],
+      [ "tacjacket", 30 ],
       [ "leather_police_jacket", 5 ],
       [ "motorbike_armor", 5 ],
       [ "poncho", 15 ],
@@ -1817,6 +1820,7 @@
       [ "jacket_jean", 35 ],
       [ "blazer", 35 ],
       [ "jacket_leather", 30 ],
+      [ "tacjacket", 30 ],
       [ "leather_police_jacket", 8 ],
       [ "gosling_jacket", 5 ],
       [ "coat_rain", 50 ],
@@ -2249,6 +2253,7 @@
       { "item": "jacket_jean", "prob": 35 },
       { "item": "blazer", "prob": 35 },
       { "item": "jacket_leather", "prob": 30 },
+      { "item": "tacjacket", "prob": 30 },
       { "item": "leather_police_jacket", "prob": 10 },
       { "item": "coat_winter", "prob": 50 },
       { "item": "peacoat", "prob": 30 },
@@ -3105,6 +3110,7 @@
       [ "corset_waist", 1 ],
       [ "football_armor", 18 ],
       [ "jacket_leather", 12 ],
+      [ "tacjacket", 30 ],
       [ "jacket_varsity", 6 ],
       [ "gosling_jacket", 1 ],
       [ "leather_police_jacket", 12 ],
@@ -4165,6 +4171,7 @@
           { "item": "jacket_jean", "prob": 80 },
           { "item": "jacket_flannel", "prob": 50 },
           { "item": "jacket_leather", "prob": 50 },
+          { "item": "tacjacket", "prob": 50 },
           { "item": "leather_police_jacket", "prob": 10 },
           { "item": "jacket_leather_red", "prob": 25 },
           { "item": "jacket_light", "prob": 60 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -387,6 +387,7 @@
       [ "pants", 75 ],
       [ "pants_army", 30 ],
       [ "jacket_army", 30 ],
+      [ "tacjacket", 25 ],
       [ "winter_pants_army", 10 ],
       [ "winter_jacket_army", 10 ],
       [ "winter_gloves_army", 10 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1435,6 +1435,7 @@
       [ "jacket_varsity", 10 ],
       { "item": "jacket_jean", "prob": 50, "damage": [ 1, 3 ] },
       { "item": "jacket_leather", "prob": 50, "damage": [ 1, 3 ] },
+      { "item": "tacjacket", "prob": 75 },
       [ "bandana", 35 ],
       [ "hat_cotton", 45 ],
       [ "hat_knit", 25 ],

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1046,6 +1046,7 @@
       { "item": "jersey", "prob": 40 },
       { "item": "puck", "prob": 5 },
       { "item": "shuttlecock", "prob": 1 },
+      { "item": "tacjacket", "prob": 10 },
       { "item": "baseball", "prob": 5 },
       { "item": "football", "prob": 5 },
       { "item": "hairpin", "prob": 20 },

diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
@@ -3476,5 +3476,167 @@
       },
       { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": 10 }
     ]
+  },
+  {
+    "id": "tacjacket",
+    "type": "ARMOR",
+    "name": { "str": "tactical jacket" },
+    "description": "A jacket with a hood and several pockets.",
+    "weight": "227 g",
+    "volume": "2250 ml",
+    "price": 4500,
+    "price_postapoc": 250,
+    "material": [ { "type": "nylon", "portion": 7 }, { "type": "cotton", "portion": 3 } ],
+    "symbol": "[",
+    "color": "blue",
+    "looks_like": "jacket_army",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 4, 8 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 4, 4 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "700 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "14 cm",
+        "moves": 80,
+        "description": "Side pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "700 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "14 cm",
+        "moves": 80,
+        "description": "Side pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "300 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "10 cm",
+        "moves": 120,
+        "description": "Arm pocket."
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "300 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "10 cm",
+        "moves": 120,
+        "description": "Arm pocket."
+      }
+    ],
+    "warmth": 15,
+    "material_thickness": 0.5,
+    "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "HOOD", "OUTER" ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "generic_tacjacket",
+        "name": { "str": "tactical jacket", "str_pl": "pairs of tactical jackets" },
+        "description": "A jacket with a hood and several pockets.  Perfect for hunting.",
+        "weight": 10
+      },
+      {
+        "id": "tacjacket_woodland",
+        "name": { "str": "woodland-camo tactical jacket", "str_pl": "pairs of woodland-camo tactical jackets" },
+        "description": "Not too dissimilar from the pattern adopted by older US Marine uniforms, this otherwise conventional tactical jacket is printed with a green, brown, and black woodland camouflage pattern.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_jungle",
+        "name": { "str": "jungle-camo tactical jacket", "str_pl": "pairs of jungle-camo tactical jackets" },
+        "description": "Similar in color to the old frog skin uniforms issued to Marine Raiders during the Second World War, this warm, comfortable tactical jacket is dyed a greenish gray hue.  Completely conventional in every other respect, the patterning would be incredibly helpful if you were planning to take a trip down to the Amazon any time soon.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_grassland",
+        "name": { "str": "grassland-camo tactical jacket", "str_pl": "pairs of grassland-camo tactical jackets" },
+        "description": "Possessing reinforced knees and a hardy construction, this tactical jacket is resplendent in a camouflage pattern of mixed light greens, browns, and beige tones.  With a set of deep pockets and an insulated design, it's an ideal piece for outdoor ventures.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_marshland",
+        "name": { "str": "marshland-camo tactical jacket", "str_pl": "pairs of marshland-camo tactical jackets" },
+        "description": "The faithful friend of waterfowl hunters, this tactical jacket is printed with a brown, gray, tan, and green camouflage pattern designed to blend in with the vegetation and reeds present in swamps and marshlands.",
+        "color": "brown",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_desert",
+        "name": { "str": "desert-camo tactical jacket", "str_pl": "pairs of desert-camo tactical jackets" },
+        "description": "Dyed a mix of brown, tan, and yellowish beige hues, this tactical jacket is designed to seamlessly blend into arid environments.  That being said, the fact that New England is famously devoid of deserts means that the pattern’s only utility is in looking cool.",
+        "color": "brown",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_alpine",
+        "name": { "str": "alpine-camo tactical jacket", "str_pl": "pairs of alpine-camo tactical jackets" },
+        "description": "The companion of aspiring mountaineers and alpine hunters, these brown, gray, and white dyed tactical jacket possess a network of jagged shapes and mottled lines, designed to break up the wearer’s profile and better conceal them against the background landscape of mountains.",
+        "color": "light_gray",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_urban",
+        "name": { "str": "urban-camo tactical jacket", "str_pl": "pairs of urban-camo tactical jackets" },
+        "description": "A rugged yet comfortable tactical jacket dyed in various scales of gray, black, and dirty white, possessing a set of sizable pockets, and printed with squares and irregular polygons to disrupt a wearer’s silhouette within man-made environments.  You would honestly not be surprised if you learned that this singular tactical jacket contains 50 shades of gray.",
+        "color": "dark_gray",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_ocean",
+        "name": { "str": "ocean-camo tactical jacket", "str_pl": "pairs of ocean-camo tactical jackets" },
+        "description": "Printed with a camouflage pattern most commonly associated with naval vessels or aircraft, this tactical jacket is festooned with a wide array of blue hues and disruptive lines, with a touch of light gray also making its presence known.  Possessing a number of deep pockets, this comfortable tactical jacket would do an admirable job of concealing you in maritime environments.  You have yet to come up with a reason why you’d ever be in a maritime environment.",
+        "color": "blue",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_river",
+        "name": { "str": "river-camo tactical jacket", "str_pl": "pairs of river-camo tactical jackets" },
+        "description": "Employed by anglers and river-side hunters for camouflage in freshwater habitats, this tactical jacket incorporates shades of green, brown, blue, and gray, along with sizable pockets and a construction favoring heat retention.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_arctic",
+        "name": { "str": "arctic-camo tactical jacket", "str_pl": "pairs of arctic-camo tactical jackets" },
+        "description": "Featuring a camouflage pattern consisting of white, shades of gray, and a slight tinge of brown, this tactical jacket is fit for snowy tundra and polar regions—or it would be, had the garment not been only moderately warmer than a light jacket.  You have yet to grasp their point for existing.",
+        "color": "white",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_grey",
+        "name": { "str": "wolf tactical jacket", "str_pl": "pairs of wolf tactical jackets" },
+        "description": "This particular tactical jacket is dyed a muted, beige-like shade of wolf gray.",
+        "color": "blue",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_coyote",
+        "name": { "str": "coyote tactical jacket", "str_pl": "pairs of coyote tactical jackets" },
+        "description": "This tactical jacket is predominantly an earthy shade of coyote brown.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_green",
+        "name": { "str": "olive-drab tactical jacket", "str_pl": "pairs of olive-drab tactical jackets" },
+        "description": "This remarkably drab, traditional camouflage tactical jacket is dyed a muted shade of OD green, much like old US Army battle dress.",
+        "color": "green",
+        "weight": 6
+      },
+      {
+        "id": "tacjacket_black_camo",
+        "name": { "str": "black-camo tactical jacket", "str_pl": "pairs of black-camo tactical jackets" },
+        "description": "Dyed a deep hue of urban black, this tactical jacket is designed to assist a wearer in concealing themselves within nighttime environments and low-light conditions.  While it’s a simple tactical jacket given a stealth-black paint job and don’t hold a candle to their more marshal brothers, they still look cool and are great at making you feel like you’re Spetsnaz.",
+        "color": "black",
+        "weight": 6
+      }
+    ]
   }
 ]