Evolution fixes part 2 (#76636)

* Update zanimal_upgrade.json * Update zed-animal.json * Update zed_ferrous.json * Update zanimal_upgrades.json * Update zombie_upgrades.json * Revert some zanimal_upgrades.json * Change zombie_upgrades.json, linted
CleverRaven · Sep 29, 2024 · 53d33e6 · 53d33e6
1 parent c199b93
commit 53d33e6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/data/json/monstergroups/zanimal_upgrades.json b/data/json/monstergroups/zanimal_upgrades.json
@@ -16,7 +16,6 @@
     "name": "GROUP_ZOMBIE_PIG_UPGRADE",
     "//": "No bionics or fungal",
     "monsters": [
-      { "monster": "mon_zombie_pig", "weight": 910, "cost_multiplier": 5 },
       { "monster": "mon_zpig_brute", "weight": 45, "cost_multiplier": 2 },
       { "monster": "mon_zombie_pig_gas", "weight": 45, "cost_multiplier": 2 }
     ]

diff --git a/data/json/monstergroups/zombie_upgrades.json b/data/json/monstergroups/zombie_upgrades.json
@@ -38,7 +38,6 @@
     "default": "mon_zombie_crawler",
     "//": "crawling zombie upgrades",
     "monsters": [
-      { "monster": "mon_zombie_crawler" },
       { "monster": "mon_zombie_crawler_pupa", "weight": 500 },
       { "monster": "mon_zombie_crawler_pupa_decoy", "weight": 500 }
     ]
@@ -47,11 +46,7 @@
     "type": "monstergroup",
     "name": "GROUP_ZOMBIE_BRAINLESS_UPGRADE",
     "//": "No bionics or fungal",
-    "monsters": [
-      { "monster": "mon_zombie_brainless", "weight": 715 },
-      { "monster": "mon_zombie_ears", "weight": 245 },
-      { "monster": "mon_afs_headless_horror", "weight": 40 }
-    ]
+    "monsters": [ { "monster": "mon_zombie_ears", "weight": 245 }, { "monster": "mon_afs_headless_horror", "weight": 40 } ]
   },
   {
     "type": "monstergroup",
@@ -121,7 +116,6 @@
     "default": "mon_zombie_brute",
     "//": "Brute upgrades.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "monsters": [
-      { "monster": "mon_zombie_brute" },
       { "monster": "mon_zombie_brute_grappler", "weight": 240 },
       { "monster": "mon_zombie_brute_ninja", "weight": 175 },
       { "monster": "mon_brute_pupa", "weight": 100 },
@@ -166,7 +160,6 @@
     "default": "mon_spawn_raptor",
     "//": "Raptor upgrades.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "monsters": [
-      { "monster": "mon_spawn_raptor" },
       { "monster": "mon_spawn_raptor_shady", "weight": 333 },
       { "monster": "mon_spawn_raptor_electric", "weight": 333 },
       { "monster": "mon_spawn_raptor_unstable", "weight": 333 }
@@ -178,7 +171,6 @@
     "default": "mon_zombie_shady",
     "//": "Shady upgrades.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "monsters": [
-      { "monster": "mon_zombie_shady" },
       { "monster": "mon_zombie_brute_ninja", "weight": 500 },
       { "monster": "mon_zombie_pupa_decoy_shady", "weight": 250 },
       { "monster": "mon_zombie_pupa_shady", "weight": 250 },
@@ -189,9 +181,7 @@
     "name": "GROUP_FERROUS_UPGRADE",
     "type": "monstergroup",
     "monsters": [
-      { "monster": "mon_zombie_rust", "weight": 600 },
-      { "monster": "mon_zombie_shell", "weight": 175 },
-      { "monster": "mon_zombie_plated", "weight": 75, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_shell", "weight": 250 },
       { "monster": "mon_zombie_urchin", "weight": 75, "cost_multiplier": 2 },
       { "monster": "mon_zombie_hammer_hands", "weight": 75, "cost_multiplier": 2 }
     ]
@@ -202,7 +192,6 @@
     "default": "mon_boomer",
     "//": "Boomer upgrades.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "monsters": [
-      { "monster": "mon_boomer" },
       { "monster": "mon_boomer_glutton", "weight": 245 },
       { "monster": "mon_boomer_huge", "weight": 310 },
       { "monster": "mon_zombie_necro_boomer", "weight": 25 },
@@ -216,7 +205,6 @@
     "name": "GROUP_SKELETON_UPGRADE",
     "type": "monstergroup",
     "monsters": [
-      { "monster": "mon_skeleton", "weight": 600 },
       { "monster": "mon_skeleton_slasher", "weight": 120, "cost_multiplier": 2 },
       { "monster": "mon_skeleton_brute", "weight": 160, "cost_multiplier": 2 },
       { "monster": "mon_skeleton_master", "weight": 60, "cost_multiplier": 2 },
@@ -227,7 +215,6 @@
     "name": "GROUP_ZOMBIE_MINER_UPGRADE",
     "type": "monstergroup",
     "monsters": [
-      { "monster": "mon_zombie_miner" },
       { "monster": "mon_zombie_shady", "weight": 150 },
       { "monster": "mon_zombie_rust", "weight": 110 },
       { "monster": "mon_zombie_tough", "weight": 60 }

diff --git a/data/json/monsters/zanimal_upgrade.json b/data/json/monsters/zanimal_upgrade.json
@@ -95,6 +95,7 @@
     "color": "i_brown",
     "melee_skill": 3,
     "bleed_rate": 25,
+    "upgrades": false,
     "armor": { "bash": 2, "cut": 4, "acid": 3, "heat": 15, "bullet": 2, "electric": 3 },
     "extend": { "flags": [ "REVIVES_HEALTHY", "NO_NECRO" ] }
   },
@@ -161,6 +162,7 @@
         "damage_max_instance": [ { "damage_type": "cut", "amount": 15, "armor_multiplier": 0.6 } ]
       }
     ],
+    "upgrades": false,
     "armor": { "stab": 30, "bash": 12, "cut": 30, "acid": 1, "bullet": 24, "electric": 2 }
   },
   {
@@ -182,6 +184,7 @@
     },
     "bleed_rate": 50,
     "special_attacks": [ [ "SMASH", 30 ], { "id": "impale" } ],
+    "upgrades": false,
     "extend": { "flags": [ "GROUP_BASH", "PUSH_VEH", "HIT_AND_RUN" ] }
   },
   {
@@ -199,6 +202,7 @@
     "death_function": { "effect": { "id": "death_tearburst", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" },
     "death_drops": "explode_zed_beast",
     "special_attacks": [ { "id": "impale" } ],
+    "upgrades": false,
     "extend": { "flags": [ "HIT_AND_RUN" ] }
   },
   {
@@ -251,6 +255,7 @@
         "damage_max_instance": [ { "damage_type": "stab", "amount": 12, "armor_multiplier": 0.7 } ]
       }
     ],
+    "upgrades": false,
     "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "CLIMBS", "PUSH_MON", "FILTHY" ]
   },
   {
@@ -277,6 +282,7 @@
       { "id": "bite_grab", "move_cost": 150, "cooldown": 5, "min_mul": 1, "max_mul": 1.8 },
       { "id": "scratch", "cooldown": 10, "min_mul": 1, "max_mul": 1.8 }
     ],
+    "upgrades": false,
     "flags": [ "SEES", "HEARS", "GRABS", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
     "armor": { "bash": 2, "cut": 17, "stab": 30, "acid": 3, "bullet": 32, "electric": 3 }
   },
@@ -291,6 +297,7 @@
     "bleed_rate": 50,
     "vision_night": 45,
     "harvest": "zombie_fur_shadow",
+    "upgrades": false,
     "flags": [
       "SEES",
       "HEARS",
@@ -328,6 +335,7 @@
       { "id": "bite_grab", "move_cost": 150, "cooldown": 3, "min_mul": 0.75, "max_mul": 1.5 },
       { "id": "scratch" }
     ],
+    "upgrades": false,
     "extend": { "flags": [ "ACIDPROOF", "ACID_BLOOD" ] },
     "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } }
   },
@@ -345,6 +353,7 @@
     "bleed_rate": 40,
     "harvest": "zombie_animal_acid",
     "special_attacks": [ [ "ACID", 15 ] ],
+    "upgrades": false,
     "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
     "flags": [
       "SEES",
@@ -376,6 +385,7 @@
     "harvest": "zombie_animal",
     "special_attacks": [ { "id": "smash", "throw_strength": 91, "cooldown": 30 } ],
     "regenerates": 9,
+    "upgrades": false,
     "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "NO_BREATHE", "REVIVES" ]
   },
   {
@@ -388,6 +398,7 @@
     "hp": 75,
     "color": "blue_white",
     "dodge": 3,
+    "upgrades": false,
     "emit_fields": [ { "emit_id": "emit_smoke_stream", "delay": "1 s" } ],
     "death_function": { "effect": { "id": "death_smokeburst", "hit_self": true }, "message": "The %s explodes!" },
     "flags": [ "SEES", "HEARS", "SMELLS", "BASHES", "POISON", "HARDTOSHOOT", "NO_BREATHE", "REVIVES" ]
@@ -407,6 +418,7 @@
     "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "harvest": "puppy_bones",
     "special_attacks": [ { "id": "smash", "throw_strength": 91, "cooldown": 30 } ],
+    "upgrades": false,
     "flags": [ "SEES", "HEARS", "BASHES", "GROUP_BASH", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "POISON", "FILTHY" ],
     "armor": { "bash": 5, "electric": 2, "cut": 16, "stab": 30, "acid": 2, "bullet": 24 }
   },
@@ -430,6 +442,7 @@
     "//grab": "Assuming it's grabbing with its mouth a bit grabbier than a zed should be about right",
     "grab_strength": 30,
     "special_attacks": [ { "id": "smash", "throw_strength": 108, "cooldown": 30 }, { "id": "grab", "cooldown": 7 } ],
+    "upgrades": false,
     "flags": [
       "SEES",
       "HEARS",
@@ -468,6 +481,7 @@
     "//grab": "Let's say the thorns make it half again as grabby",
     "grab_strength": 45,
     "special_attacks": [ { "id": "scratch" }, { "id": "grab", "cooldown": 7 }, [ "PARA_STING", 30 ] ],
+    "upgrades": false,
     "flags": [
       "SEES",
       "HEARS",

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -160,7 +160,7 @@
     "melee_dice_sides": 4,
     "bleed_rate": 50,
     "vision_day": 30,
-    "upgrades": { "half_life": 42, "into": "mon_dog_zombie_brute" },
+    "upgrades": { "half_life": 42, "into": "mon_zombie_dog_acidic" },
     "fungalize_into": "mon_zombie_dog_fungus"
   },
   {

diff --git a/data/json/monsters/zed_ferrous.json b/data/json/monsters/zed_ferrous.json
@@ -31,6 +31,7 @@
     "harvest": "zombie_rust",
     "attack_effs": [ { "id": "tetanus", "duration": 300, "chance": 10 } ],
     "burn_into": "mon_zombie_scorched_rust",
+    "upgrades": { "half_life": 30, "into": "mon_zombie_plated" },
     "armor": { "bash": 14, "cut": 14, "stab": 14, "bullet": 14 },
     "extend": { "weakpoint_sets": [ "wps_metal_shell_armor" ], "families": [ "prof_wp_nat_armored" ] }
   },
@@ -53,6 +54,7 @@
     "grab_strength": 30,
     "attack_effs": [ { "id": "tetanus", "duration": 300, "chance": 10 } ],
     "burn_into": "mon_zombie_scorched_rust",
+    "upgrades": false,
     "armor": { "bash": 18, "cut": 18, "stab": 18, "bullet": 18 },
     "extend": { "flags": [ "SMELLS" ], "weakpoint_sets": [ "wps_metal_shell_armor" ], "families": [ "prof_wp_nat_armored" ] }
   },