Update zombie soldier drops (#36446)

CleverRaven · Dec 28, 2019 · f8ba267 · f8ba267
1 parent f9431a9
commit f8ba267
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 120 deletions.
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -94,14 +94,20 @@
     "items": [
       { "group": "clothing_soldier_shirt" },
       { "item": "jacket_army" },
+      { "item": "elbow_pads", "prob": 10 },
       { "item": "pants_army" },
+      { "item": "knee_pads", "prob": 85 },
       { "item": "boots_combat" },
-      { "item": "helmet_army", "prob": 20 },
-      { "item": "gloves_tactical", "prob": 10 },
-      { "item": "elbow_pads", "prob": 10 },
+      { "item": "helmet_army", "prob": 80 },
+      { "item": "gloves_tactical", "prob": 60 },
       { "group": "clothing_tactical_leg", "prob": 15 },
       { "group": "clothing_tactical_torso", "prob": 15 },
-      { "group": "underwear" },
+      {
+        "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": [
@@ -123,14 +129,20 @@
     "items": [
       { "group": "clothing_soldier_shirt" },
       { "item": "winter_jacket_army" },
+      { "item": "elbow_pads", "prob": 10 },
       { "item": "winter_pants_army" },
+      { "item": "knee_pads", "prob": 85 },
       { "item": "boots_combat" },
-      { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 20 },
-      { "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 40 },
-      { "item": "elbow_pads", "prob": 10 },
+      { "collection": [ { "item": "helmet_army" }, { "item": "helmet_liner" } ], "prob": 80 },
+      { "collection": [ { "item": "gloves_liner" }, { "item": "winter_gloves_army" } ], "prob": 80 },
       { "group": "clothing_tactical_leg", "prob": 15 },
       { "group": "clothing_tactical_torso", "prob": 15 },
-      { "group": "underwear" },
+      {
+        "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": [
@@ -259,7 +271,7 @@
     "id": "clothing_tactical_leg",
     "type": "item_group",
     "//": "Tactical gear that can be strapped to the legs",
-    "items": [ [ "knee_pads", 100 ], [ "legpouch_large", 100 ], [ "legrig", 100 ] ]
+    "items": [ [ "legpouch_large", 100 ], [ "legrig", 100 ] ]
   },
   {
     "id": "clothing_tactical_torso",
@@ -2219,26 +2231,6 @@
       [ "survnote", 30 ]
     ]
   },
-  {
-    "type": "item_group",
-    "id": "bio_op_face",
-    "items": [ [ "glasses_bal", 40 ], [ "mask_filter", 30 ], [ "mask_bal", 30 ], [ "mask_gas", 40 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "bio_op_torso",
-    "items": [ [ "dragonskin", 50 ], [ "winter_jacket_army", 10 ], [ "modularvestceramic", 40 ], [ "modularvestkevlar", 20 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "bio_op_boots",
-    "items": [ [ "boots_combat", 1 ] ]
-  },
-  {
-    "type": "item_group",
-    "id": "bio_op_gloves",
-    "items": [ [ "gloves_tactical", 60 ], [ "gloves_fingerless", 40 ], [ "winter_gloves_army", 40 ] ]
-  },
   {
     "type": "item_group",
     "id": "museum_armor",

diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
@@ -523,30 +523,31 @@
   {
     "type": "item_group",
     "id": "MRE",
-    "items": [
-      [ "mre_chilibeans_box", 45 ],
-      [ "mre_bbqbeef_box", 45 ],
-      [ "mre_chickennoodle_box", 45 ],
-      [ "mre_spaghetti_box", 45 ],
-      [ "mre_chicken_box", 45 ],
-      [ "mre_beeftaco_box", 45 ],
-      [ "mre_beef_box", 45 ],
-      [ "mre_meatball_box", 45 ],
-      [ "mre_beefstew_box", 45 ],
-      [ "mre_chilimac_box", 45 ],
-      [ "mre_veggy_box", 45 ],
-      [ "mre_macaronimarinara_box", 45 ],
-      [ "mre_cheesetort_box", 45 ],
-      [ "mre_mushroomfettuccine_box", 45 ],
-      [ "mre_mexicanchickenstew_box", 45 ],
-      [ "mre_maplesausage_box", 45 ],
-      [ "mre_ravioli_box", 45 ],
-      [ "mre_hashbrownbacon_box", 45 ],
-      [ "mre_lemontuna_box", 45 ],
-      [ "mre_asianbeef_box", 45 ],
-      [ "mre_chickenpesto_box", 45 ],
-      [ "mre_southwestbeef_box", 45 ],
-      [ "mre_hotdog_box", 45 ]
+    "subtype": "distribution",
+    "entries": [
+      { "item": "mre_chilibeans_box" },
+      { "item": "mre_bbqbeef_box" },
+      { "item": "mre_chickennoodle_box" },
+      { "item": "mre_spaghetti_box" },
+      { "item": "mre_chicken_box" },
+      { "item": "mre_beeftaco_box" },
+      { "item": "mre_beef_box" },
+      { "item": "mre_meatball_box" },
+      { "item": "mre_beefstew_box" },
+      { "item": "mre_chilimac_box" },
+      { "item": "mre_veggy_box" },
+      { "item": "mre_macaronimarinara_box" },
+      { "item": "mre_cheesetort_box" },
+      { "item": "mre_mushroomfettuccine_box" },
+      { "item": "mre_mexicanchickenstew_box" },
+      { "item": "mre_maplesausage_box" },
+      { "item": "mre_ravioli_box" },
+      { "item": "mre_hashbrownbacon_box" },
+      { "item": "mre_lemontuna_box" },
+      { "item": "mre_asianbeef_box" },
+      { "item": "mre_chickenpesto_box" },
+      { "item": "mre_southwestbeef_box" },
+      { "item": "mre_hotdog_box" }
     ]
   },
   {

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -1,4 +1,105 @@
 [
+  {
+    "type": "item_group",
+    "id": "military_standard_assault_rifles",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "m4a1", "prob": 88, "charges": [ 0, 30 ] },
+      { "item": "m27iar", "prob": 10, "charges": [ 0, 30 ] },
+      { "item": "m16a4", "prob": 2, "charges": [ 0, 30 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_standard_shotguns",
+    "subtype": "distribution",
+    "entries": [ { "item": "m1014", "prob": 60, "charges": [ 0, 8 ] }, { "item": "mossberg_590", "prob": 40, "charges": [ 0, 9 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_standard_sniper_rifles",
+    "subtype": "distribution",
+    "entries": [ { "item": "m2010", "prob": 20, "charges": [ 0, 5 ] }, { "item": "m110a1", "prob": 80, "charges": [ 0, 20 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_standard_lmgs",
+    "subtype": "distribution",
+    "entries": [ { "item": "m249", "prob": 100, "charges": [ 0, 200 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_standard_pistols",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "m9", "prob": 30, "charges": [ 0, 15 ] },
+      { "item": "m17", "prob": 65, "charges": [ 0, 17 ] },
+      { "item": "glock_19", "prob": 3, "charges": [ 0, 15 ] },
+      { "item": "m1911_MEU", "prob": 2, "charges": [ 0, 7 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_standard_grenades",
+    "subtype": "distribution",
+    "entries": [ { "item": "grenade", "prob": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "military_patrol_food",
+    "subtype": "collection",
+    "entries": [
+      { "group": "MRE", "count": [ 1, 3 ], "prob": 70 },
+      { "item": "chocolate", "prob": 20 },
+      { "item": "neccowafers", "prob": 20 },
+      { "item": "water_clean", "container-item": "canteen", "prob": 80, "charges": [ 0, 6 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "infantry_common_gear",
+    "subtype": "collection",
+    "entries": [
+      { "item": "e_tool", "prob": 60 },
+      { "item": "mask_gas", "prob": 20 },
+      { "item": "two_way_radio", "prob": 60 },
+      { "item": "sheath", "contents-item": "knife_combat", "prob": 80 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "infantry_officer_gear",
+    "subtype": "collection",
+    "entries": [
+      { "item": "holster", "contents-group": "military_standard_pistols", "prob": 90 },
+      { "item": "id_military", "prob": 90 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "infantry_medical_gear",
+    "subtype": "collection",
+    "entries": [
+      { "item": "1st_aid", "prob": 90 },
+      { "item": "quikclot", "prob": 60 },
+      { "collection": [ { "item": "morphine" }, { "item": "syringe" } ], "prob": 30 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sopmod",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [ { "item": "holo_sight", "prob": 50 }, { "item": "acog_scope", "prob": 30 }, { "item": "red_dot_sight", "prob": 20 } ]
+      },
+      { "distribution": [ { "item": "grip", "prob": 70 }, { "item": "m203", "prob": 30 } ] },
+      { "item": "offset_sights", "prob": 30 },
+      { "item": "shoulder_strap", "prob": 70 },
+      { "item": "rail_laser_sight", "prob": 30 },
+      { "item": "suppressor", "prob": 70 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "military",

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -4,7 +4,7 @@
     "type": "item_group",
     "subtype": "collection",
     "//": "Smokable item and something to light it with",
-    "items": [
+    "entries": [
       {
         "distribution": [
           { "item": "cig", "prob": 70, "charges": [ 1, 10 ] },

diff --git a/data/json/monsterdrops/monster_drops.json b/data/json/monsterdrops/monster_drops.json
@@ -347,38 +347,6 @@
       { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }
     ]
   },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "mon_zombie_bio_op_death_drops",
-    "ammo": 30,
-    "magazine": 100,
-    "entries": [
-      { "group": "bio_op_boots", "damage": [ 1, 4 ] },
-      { "group": "mil_armor_torso", "damage": [ 1, 4 ] },
-      { "group": "mil_armor_pants", "damage": [ 1, 4 ] },
-      { "group": "mil_armor_helmet", "damage": [ 1, 4 ], "prob": 50 },
-      { "group": "bio_op_face", "damage": [ 1, 4 ], "prob": 50 },
-      { "group": "bio_op_torso", "damage": [ 1, 4 ], "prob": 50 },
-      { "group": "bio_op_gloves", "damage": [ 1, 4 ], "prob": 50 },
-      { "group": "underwear", "damage": [ 1, 4 ] },
-      {
-        "distribution": [
-          { "group": "ammo_milspec", "prob": 15 },
-          { "group": "guns_pistol_milspec", "prob": 5 },
-          { "group": "guns_shotgun_milspec", "prob": 4 },
-          { "group": "guns_smg_milspec", "prob": 5 },
-          { "group": "guns_rifle_milspec", "prob": 10 },
-          { "group": "bots", "prob": 1 },
-          { "group": "grenades", "prob": 5 },
-          { "group": "mil_accessories", "prob": 10 },
-          { "group": "mil_food", "prob": 5 },
-          { "group": "bionics_mil", "prob": 1 }
-        ]
-      },
-      { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }
-    ]
-  },
   {
     "type": "item_group",
     "subtype": "collection",

diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json
@@ -8,45 +8,22 @@
     "entries": [
       {
         "distribution": [
-          { "group": "clothing_soldier_set", "prob": 65, "damage-min": 1, "damage-max": 4 },
-          { "group": "clothing_soldier_winter_set", "prob": 35, "damage-min": 1, "damage-max": 4 }
+          { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] },
+          { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] }
         ]
       },
-      { "group": "gear_soldier_sidearm", "prob": 30, "damage-min": 1, "damage-max": 4 },
-      {
-        "collection": [
-          {
-            "distribution": [
-              { "group": "guns_rifle_milspec", "prob": 75, "damage-min": 1, "damage-max": 4 },
-              { "group": "guns_shotgun_milspec", "prob": 25, "damage-min": 1, "damage-max": 4 }
-            ]
-          },
-          {
-            "distribution": [
-              { "item": "red_dot_sight", "prob": 100 },
-              { "item": "suppressor", "prob": 100 },
-              { "item": "laser_sight", "prob": 50 },
-              { "collection": [ { "item": "m320" }, { "group": "ammo_launcher_grenade" } ], "prob": 100 }
-            ],
-            "prob": 30
-          }
-        ],
-        "prob": 20
-      },
       {
         "distribution": [
-          { "item": "LAW_Packed", "prob": 20 },
-          { "item": "e_tool", "prob": 100 },
-          { "item": "mask_gas", "prob": 100, "charges-min": 1, "charges-max": 100, "damage-min": 1, "damage-max": 4 },
-          { "item": "two_way_radio", "prob": 50 },
-          { "item": "c4", "prob": 10 }
-        ],
-        "prob": 20
+          { "group": "military_standard_assault_rifles", "prob": 75 },
+          { "group": "military_standard_lmgs", "prob": 10 },
+          { "group": "military_standard_sniper_rifles", "prob": 10 },
+          { "group": "military_standard_shotguns", "prob": 5 }
+        ]
       },
-      { "item": "grenade", "prob": 5 },
-      { "group": "drugs_soldier", "prob": 20 },
-      { "group": "mil_food", "prob": 15 },
-      { "item": "id_military", "prob": 5 },
+      { "group": "infantry_common_gear" },
+      { "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 },
       { "group": "misc_smoking", "prob": 30 }
     ]
@@ -56,5 +33,36 @@
     "type": "item_group",
     "subtype": "distribution",
     "entries": [ { "group": "mon_zombie_soldier_death_drops" }, { "group": "mon_zombie_cop_death_drops" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "mon_zombie_bio_op_death_drops",
+    "magazine": 100,
+    "ammo": 60,
+    "entries": [
+      {
+        "distribution": [
+          { "group": "clothing_soldier_set", "prob": 65, "damage": [ 1, 4 ] },
+          { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 1, 4 ] }
+        ]
+      },
+      {
+        "distribution": [
+          { "group": "military_standard_assault_rifles", "contents-group": "sopmod", "prob": 75 },
+          { "group": "military_standard_lmgs", "prob": 10 },
+          { "group": "military_standard_sniper_rifles", "prob": 10 },
+          { "group": "military_standard_shotguns", "prob": 5 }
+        ]
+      },
+      { "group": "infantry_common_gear" },
+      { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
+      { "group": "military_patrol_food" },
+      {
+        "collection": [ { "group": "infantry_officer_gear", "prob": 90 }, { "group": "infantry_medical_gear", "prob": 80 } ]
+      },
+      { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
+      { "group": "misc_smoking", "prob": 30 }
+    ]
   }
 ]