Add items, update military pilot drops (#36558)

CleverRaven · Jan 2, 2020 · 3399e37 · 3399e37
1 parent 0918b4e
commit 3399e37
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 17 deletions.
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -96,19 +96,21 @@
       { "item": "jacket_army" },
       { "item": "elbow_pads", "prob": 10 },
       { "item": "pants_army" },
+      { "item": "webbing_belt" },
       { "item": "knee_pads", "prob": 85 },
+      { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] },
       { "item": "boots_combat" },
       { "item": "helmet_army", "prob": 80 },
       { "item": "gloves_tactical", "prob": 60 },
+      { "item": "ballistic_vest", "prob": 90 },
+      { "item": "molle_pack", "prob": 85 },
       { "group": "clothing_tactical_leg", "prob": 15 },
-      { "group": "clothing_tactical_torso", "prob": 15 },
       {
         "distribution": [
           { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] },
           { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] }
         ]
       },
-      { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] },
       {
         "distribution": [
           { "group": "clothing_glasses", "prob": 60 },
@@ -131,19 +133,21 @@
       { "item": "winter_jacket_army" },
       { "item": "elbow_pads", "prob": 10 },
       { "item": "winter_pants_army" },
+      { "item": "webbing_belt" },
       { "item": "knee_pads", "prob": 85 },
+      { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] },
       { "item": "boots_combat" },
       { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 },
-      { "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 80 },
+      { "collection": [ { "item": "gloves_liner", "prob": 60 }, { "item": "winter_gloves_army" } ], "prob": 80 },
+      { "item": "ballistic_vest", "prob": 90 },
+      { "item": "molle_pack", "prob": 85 },
       { "group": "clothing_tactical_leg", "prob": 15 },
-      { "group": "clothing_tactical_torso", "prob": 15 },
       {
         "distribution": [
           { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] },
           { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] }
         ]
       },
-      { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] },
       {
         "distribution": [
           { "group": "clothing_glasses", "prob": 60 },
@@ -162,13 +166,20 @@
     "subtype": "collection",
     "//": "Standard set of clothes worn by a military helicopter pilot.",
     "items": [
-      { "distribution": [ { "item": "longshirt", "prob": 75 }, { "item": "tshirt", "prob": 25 } ] },
+      { "group": "clothing_soldier_shirt" },
       { "item": "jacket_army" },
       { "item": "pants_army" },
+      { "item": "webbing_belt" },
+      { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] },
       { "item": "boots_combat" },
-      { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ] },
-      { "group": "underwear" },
-      { "distribution": [ { "item": "socks", "prob": 10 }, { "item": "socks_wool", "prob": 90 } ] },
+      { "item": "helmet_army", "prob": 80 },
+      { "item": "gloves_tactical", "prob": 60 },
+      {
+        "distribution": [
+          { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] },
+          { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] }
+        ]
+      },
       { "distribution": [ { "item": "fancy_sunglasses", "prob": 95 }, { "item": "glasses_bal", "prob": 5 } ] },
       { "group": "clothing_watch", "prob": 85 },
       { "item": "goggles_ir", "prob": 10 }
@@ -178,7 +189,7 @@
     "id": "clothing_soldier_shirt",
     "type": "item_group",
     "subtype": "distribution",
-    "entries": [ { "item": "army_top", "prob": 50 }, { "item": "longshirt", "prob": 40 }, { "item": "tshirt", "prob": 20 } ]
+    "entries": [ { "item": "tshirt" } ]
   },
   {
     "id": "clothing_outdoor_pants",

diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json
@@ -0,0 +1,22 @@
+[
+  {
+    "id": "ballistic_vest",
+    "type": "ARMOR",
+    "category": "armor",
+    "//": "Based on US Army SPCS",
+    "name": { "str": "ballistic vest" },
+    "description": "Ballistic armor with ESAPI ceramic armor plates.",
+    "weight": "9911 g",
+    "volume": "6 L",
+    "price": 280000,
+    "material": [ "nylon", "ceramic" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "covers": [ "TORSO" ],
+    "coverage": 85,
+    "encumbrance": 10,
+    "warmth": 15,
+    "material_thickness": 20,
+    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY" ]
+  }
+]
diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -0,0 +1,16 @@
+[
+  {
+    "id": "webbing_belt",
+    "type": "ARMOR",
+    "name": "webbing belt",
+    "description": "A 2-inch nylon webbing belt commonly used by military forces.",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": 1000,
+    "material": [ "nylon", "steel" ],
+    "symbol": "[",
+    "color": "yellow",
+    "covers": [ "TORSO" ],
+    "flags": [ "WAIST", "WATER_FRIENDLY" ]
+  }
+]
diff --git a/data/json/monsterdrops/zombie_military_pilot.json b/data/json/monsterdrops/zombie_military_pilot.json
@@ -6,13 +6,13 @@
     "magazine": 100,
     "ammo": 60,
     "entries": [
-      { "group": "clothing_military_pilot", "prob": 65, "damage-min": 1, "damage-max": 4 },
-      { "group": "gear_soldier_sidearm", "prob": 50, "damage-min": 1, "damage-max": 4 },
-      { "item": "two_way_radio", "prob": 50, "damage-min": 1, "damage-max": 4 },
+      { "group": "clothing_military_pilot", "damage": [ 1, 4 ] },
+      { "item": "holster", "contents-group": "military_standard_pistols" },
+      { "item": "two_way_radio", "prob": 90 },
       { "item": "adderall", "prob": 40 },
-      { "item": "id_military", "prob": 5 },
-      { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
-      { "group": "mil_food", "prob": 15 },
+      { "item": "id_military", "prob": 25 },
+      { "group": "military_patrol_food", "prob": 30 },
+      { "item": "cash_card", "prob": 10, "charges": [ 0, 50000 ] },
       { "group": "misc_smoking", "prob": 30 }
     ]
   }

diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json
@@ -24,7 +24,7 @@
       { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
       { "group": "military_patrol_food" },
       { "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
-      { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
+      { "item": "cash_card", "prob": 10, "charges": [ 0, 50000 ] },
       { "group": "misc_smoking", "prob": 30 }
     ]
   },