Merge pull request #77737 from DukePaulAtreid3s/Feral-Sanity-Check

Fix Feral Soldier Drops
CleverRaven · Nov 13, 2024 · 3d12651 · 3d12651
2 parents 40578f2 + 6195b3b
commit 3d12651
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 46 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -325,29 +325,6 @@
       { "group": "clothing_watch", "prob": 5 }
     ]
   },
-  {
-    "id": "clothing_soldier_broken_armor_set",
-    "type": "item_group",
-    "subtype": "collection",
-    "items": [
-      { "group": "clothing_military" },
-      { "item": "elbow_pads", "prob": 10 },
-      { "item": "knee_pads", "prob": 85 },
-      {
-        "distribution": [ { "group": "army_helmet_nvg", "prob": 10 }, { "item": "helmet_army", "prob": 90 } ],
-        "prob": 80
-      },
-      { "item": "gloves_tactical", "prob": 60 },
-      { "group": "military_ballistic_vest", "prob": 100 },
-      { "group": "molle_backpacks_and_accessories", "prob": 85 },
-      { "group": "clothing_tactical_leg", "prob": 15 },
-      {
-        "distribution": [ { "group": "clothing_glasses", "prob": 60 }, { "item": "glasses_bal", "prob": 30 } ],
-        "prob": 20
-      },
-      { "group": "clothing_watch", "prob": 5 }
-    ]
-  },
   {
     "id": "clothing_soldier_heavy_set",
     "type": "item_group",

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -466,6 +466,17 @@
       { "group": "infantry_knives", "prob": 80 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "infantry_common_gear_feral",
+    "subtype": "collection",
+    "entries": [
+      { "item": "e_tool", "prob": 60 },
+      { "group": "gasmask_bag_full", "prob": 20 },
+      { "item": "two_way_radio", "prob": 60, "charges": [ 0, 100 ] },
+      { "group": "infantry_knives", "prob": 100 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "infantry_knives",

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -668,34 +668,19 @@
     "magazine": 100,
     "ammo": 0,
     "entries": [
-      { "distribution": [ { "group": "clothing_soldier_broken_armor_set", "prob": 100, "damage": [ 2, 4 ] } ] },
+      {
+        "distribution": [
+          { "group": "clothing_soldier_set", "prob": 65, "damage": [ 0, 3 ] },
+          { "group": "clothing_soldier_winter_set", "prob": 35, "damage": [ 0, 3 ] }
+        ]
+      },
+      { "group": "infantry_common_gear_feral" },
       { "group": "military_standard_grenades", "count": [ 1, 3 ], "prob": 20 },
       { "group": "military_patrol_food" },
-      { "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 25 },
+      { "distribution": [ { "group": "infantry_officer_gear" }, { "group": "infantry_medical_gear" } ], "prob": 40 },
       { "group": "wallets", "prob": 10 },
       { "group": "pocket_cigar", "prob": 15 },
       { "group": "misc_smoking_legal", "prob": 30 },
-      { "item": "e_tool", "prob": 15, "damage": [ 1, 4 ] },
-      {
-        "distribution": [
-          { "item": "mask_gas", "charges": [ 0, 100 ], "prob": 25, "damage": [ 1, 4 ] },
-          {
-            "item": "mask_gas",
-            "charges": [ 0, 100 ],
-            "contents-group": "gasmask_inserts_in_use",
-            "prob": 25,
-            "damage": [ 1, 4 ]
-          },
-          { "group": "gasmask_bag_full", "prob": 25, "damage": [ 1, 4 ] },
-          { "group": "gasmask_bag_used", "prob": 60, "damage": [ 1, 4 ] }
-        ],
-        "prob": 5
-      },
-      { "item": "two_way_radio", "prob": 15, "charges": [ 0, 100 ], "damage": [ 1, 4 ] },
-      { "group": "infantry_knives", "prob": 100, "damage": [ 2, 4 ] },
-      { "item": "stanag30", "prob": 50, "charges": 0 },
-      { "item": "stanag30ranger", "prob": 1, "charges": 0 },
-      { "item": "stanag30", "prob": 50, "charges": 0 },
       { "item": "dog_tag", "prob": 40 }
     ]
   },