feat(balance): bionic harvest follow-ups part 1 (#3769)

* Commit for remote * And finish up implementation of mil spawns * Update mods
cataclysmbnteam · Nov 28, 2023 · 348c064 · 348c064
1 parent b8ebbfa
commit 348c064
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 16 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -548,6 +548,7 @@
     "//": "zombies with Kevlar infused into their skin",
     "type": "harvest",
     "entries": [
+      { "drop": "harvest_maybe_military", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
@@ -623,6 +624,28 @@
       { "drop": "stick_fiber", "base_num": [ 4, 8 ], "scale_num": [ 0.5, 0.7 ], "max": 10, "type": "bone" }
     ]
   },
+  {
+    "id": "zombie_maybe_mil_bionics",
+    "type": "harvest",
+    "entries": [
+      { "drop": "harvest_maybe_military", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "pheromone", "type": "bionic", "max": 1 }
+    ]
+  },
+  {
+    "id": "zombie_maybe_heavy_mil_bionics",
+    "type": "harvest",
+    "entries": [
+      { "drop": "harvest_maybe_military_heavy", "type": "bionic_group", "faults": [ "fault_bionic_nonsterile" ] },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "pheromone", "type": "bionic", "max": 1 }
+    ]
+  },
   {
     "id": "CBM_BASIC",
     "type": "harvest",

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
@@ -112,12 +112,12 @@
     "id": "cyborg_harvest",
     "type": "item_group",
     "subtype": "distribution",
-    "//": "Lower-tier bionic harvests have a 1/3 chance of generating nothing, 1/3 components, 1/3 CBMs",
+    "//": "Higher-tier bionic harvests have a 1/4 chance of generating nothing, 1/4 components, 1/2 CBMs",
     "entries": [
-      { "item": "null", "prob": 33 },
-      { "item": "burnt_out_bionic", "prob": 11 },
-      { "group": "bionic_salvage_junk", "prob": 22 },
-      { "group": "bionics_broken_cyborg", "prob": 33 }
+      { "item": "null", "prob": 25 },
+      { "item": "burnt_out_bionic", "prob": 10 },
+      { "group": "bionic_salvage_junk", "prob": 15 },
+      { "group": "bionics_broken_cyborg", "prob": 50 }
     ]
   },
   {
@@ -166,7 +166,6 @@
     "id": "harvest_power_storage_mil",
     "type": "item_group",
     "subtype": "distribution",
-    "//": "Higher-tier bionic harvests have a 1/4 chance of generating nothing, 1/4 components, 1/2 CBMs",
     "entries": [
       { "item": "null", "prob": 25 },
       { "group": "bionic_salvage_junk_mil", "prob": 25 },
@@ -177,6 +176,7 @@
     "id": "harvest_bionics_common",
     "type": "item_group",
     "subtype": "distribution",
+    "//": "Lower-tier bionic harvests have a 1/3 chance of generating nothing, 1/3 components, 1/3 CBMs",
     "entries": [
       { "item": "null", "prob": 33 },
       { "group": "bionic_salvage_junk", "prob": 33 },
@@ -262,5 +262,40 @@
       { "group": "bionic_salvage_junk", "prob": 33 },
       { "group": "bionics_zapper", "prob": 33 }
     ]
+  },
+  {
+    "id": "harvest_maybe_military",
+    "type": "item_group",
+    "subtype": "distribution",
+    "//": "Non-cyborg military spawns, 10% of them will roll for either components or a single CBM.",
+    "entries": [
+      { "item": "null", "prob": 90 },
+      {
+        "distribution": [
+          { "group": "bionic_salvage_junk_mil", "prob": 50 },
+          { "group": "bionic_power_storage_mil", "prob": 25 },
+          { "group": "bionics_mil", "prob": 15 },
+          { "group": "bionics_heavy_mil", "prob": 10 }
+        ],
+        "prob": 10
+      }
+    ]
+  },
+  {
+    "id": "harvest_maybe_military_heavy",
+    "type": "item_group",
+    "subtype": "distribution",
+    "//": "Non-cyborg heavy military spawns, 25% of them will roll for either components or a CBM from heavy-mil itemgroup.",
+    "entries": [
+      { "item": "null", "prob": 75 },
+      {
+        "distribution": [
+          { "group": "bionic_salvage_junk_mil", "prob": 50 },
+          { "group": "bionic_power_storage_mil", "prob": 25 },
+          { "group": "bionics_heavy_mil", "prob": 25 }
+        ],
+        "prob": 25
+      }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/bionics.json b/data/json/itemgroups/bionics.json
@@ -189,6 +189,32 @@
       [ "afs_bio_dopamine_stimulators", 10 ]
     ]
   },
+  {
+    "type": "item_group",
+    "id": "bionics_heavy_mil",
+    "subtype": "distribution",
+    "//": "Bionics for power armor use, engineering roles, and other specialist soldiers that aren't commandos.",
+    "items": [
+      [ "bio_batteries", 10 ],
+      [ "bio_blood_anal", 5 ],
+      [ "bio_cable", 10 ],
+      [ "bio_cqb", 5 ],
+      [ "bio_ethanol", 10 ],
+      [ "bio_fuel_cell_gasoline", 10 ],
+      [ "bio_geiger", 5 ],
+      [ "bio_ground_sonar", 5 ],
+      [ "bio_heatsink", 10 ],
+      [ "bio_hydraulics", 10 ],
+      [ "bio_jointservo", 10 ],
+      [ "bio_power_armor_interface", 15 ],
+      [ "bio_power_armor_interface_mkII", 15 ],
+      [ "bio_reactor", 10 ],
+      [ "bio_shock_absorber", 5 ],
+      [ "bio_targeting", 10 ],
+      [ "bio_ups", 15 ],
+      [ "bio_weight", 15 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "bionics_op",

diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json
@@ -80,7 +80,7 @@
     "armor_stab": 4,
     "vision_day": 30,
     "vision_night": 3,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [ [ "GRAB", 10 ], [ "scratch", 10 ] ],
     "death_drops": "mon_zombie_labsecurity_death_drops",
     "death_function": [ "NORMAL" ],

diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json
@@ -27,7 +27,7 @@
     "armor_bullet": 35,
     "vision_day": 30,
     "vision_night": 3,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 } ],
     "death_drops": "mon_zombie_soldier_death_drops",
     "death_function": [ "NORMAL" ],
@@ -77,7 +77,7 @@
     "armor_bullet": 35,
     "vision_day": 30,
     "vision_night": 35,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [
       {
         "type": "bite",
@@ -319,7 +319,7 @@
     "armor_bullet": 4,
     "vision_day": 35,
     "vision_night": 5,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ],
     "death_drops": "mon_zombie_military_pilot_death_drops",
     "death_function": [ "NORMAL" ],
@@ -369,7 +369,7 @@
     "vision_day": 30,
     "vision_night": 3,
     "luminance": 8,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_heavy_mil_bionics",
     "starting_ammo": { "pressurized_tank": 1000 },
     "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_flamer", 100 ] ] },
     "death_function": [ "FIREBALL" ],
@@ -421,7 +421,7 @@
     "armor_fire": 10,
     "vision_day": 30,
     "vision_night": 3,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_heavy_mil_bionics",
     "death_drops": "mon_zombie_armored_death_drops",
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_scorched",

diff --git a/data/mods/Aftershock/mobs/zombies.json b/data/mods/Aftershock/mobs/zombies.json
@@ -205,7 +205,7 @@
     "armor_bullet": 13,
     "vision_day": 50,
     "vision_night": 4,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_heavy_mil_bionics",
     "special_attacks": [ [ "SMASH", 28 ] ],
     "death_drops": "xl_uplift_death_drop",
     "death_function": [ "NORMAL" ],

diff --git a/data/mods/No_Hope/monsters.json b/data/mods/No_Hope/monsters.json
@@ -468,7 +468,7 @@
     "armor_cut": 25,
     "vision_day": 30,
     "vision_night": 3,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [ { "type": "bite", "cooldown": 5, "min_mul": 0.8 } ],
     "death_drops": "mon_zombie_soldier_death_drops_no_hope",
     "death_function": [ "NORMAL" ],
@@ -503,7 +503,7 @@
     "armor_cut": 25,
     "vision_day": 30,
     "vision_night": 35,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_mil_bionics",
     "special_attacks": [
       {
         "type": "bite",
@@ -544,7 +544,7 @@
     "vision_day": 30,
     "vision_night": 3,
     "luminance": 8,
-    "harvest": "zombie",
+    "harvest": "zombie_maybe_heavy_mil_bionics",
     "starting_ammo": { "pressurized_tank": 1000 },
     "death_drops": {
       "subtype": "collection",