upgrade problem solved

CleverRaven · Feb 11, 2024 · e3454e6 · e3454e6
1 parent e7892bc
commit e3454e6
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json
@@ -60,6 +60,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "hive", 80 ] ] },
     "fungalize_into": "mon_beekeeper_fungal",
+    "upgrades": false,
     "armor": { "bash": 6, "cut": 8, "bullet": 6, "electric": 1 },
     "extend": { "weakpoint_sets": [ "wps_natural_armor" ], "families": [ "prof_wp_nat_armored" ] }
   },
@@ -80,6 +81,7 @@
     "melee_dice_sides": 4,
     "vision_day": 30,
     "death_drops": "mon_zombie_cop_death_drops",
+    "upgrades": false,
     "armor": { "bash": 6, "cut": 6, "stab": 6, "bullet": 6, "electric": 2 },
     "extend": { "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "families": [ "prof_wp_syn_armored" ] }
   },
@@ -134,11 +136,12 @@
     "//grab": "Slightly stronger, but can't bite because of the gear.",
     "grab_strength": 30,
     "death_drops": "mon_zombie_fireman_death_drops",
+    "upgrades": false,
     "armor": { "bash": 6, "cut": 6, "acid": 3, "heat": 10, "bullet": 5, "electric": 4 },
     "extend": {
       "weakpoint_sets": [ "wps_humanoid_turnout_gear", "wps_humanoid_full_helmet" ],
       "families": [ "prof_wp_syn_armored" ],
-      "flags": [ "ACIDPROOF", "NO_FUNG_DMG" ]
+      "flags": [ "ACIDPROOF" ]
     },
     "delete": { "special_attacks": [ "bite_humanoid" ] }
   },
@@ -160,12 +163,9 @@
       }
     ],
     "death_drops": "mon_zombie_hazmat_death_drops",
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 4, "bullet": 3, "electric": 5 },
-    "extend": {
-      "weakpoint_sets": [ "wps_humanoid_gasmask" ],
-      "families": [ "prof_wp_syn_armored" ],
-      "flags": [ "ACIDPROOF", "NO_FUNG_DMG" ]
-    },
+    "extend": { "weakpoint_sets": [ "wps_humanoid_gasmask" ], "families": [ "prof_wp_syn_armored" ], "flags": [ "ACIDPROOF" ] },
     "delete": { "special_attacks": [ "bite_humanoid", "scratch_humanoid" ] }
   },
   {

diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json
@@ -57,6 +57,7 @@
     "special_when_hit": [ "ACIDSPLASH", 100 ],
     "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
     "fungalize_into": "mon_zombie_fungus_acidic",
+    "upgrades": false,
     "armor": { "bash": 10, "cut": 2, "stab": 12, "bullet": 2, "electric": 2 },
     "extend": {
       "flags": [ "ACIDPROOF", "ACID_BLOOD", "RANGED_ATTACKER" ],

diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
@@ -42,6 +42,7 @@
     "melee_skill": 4,
     "dodge": 3,
     "bleed_rate": 50,
+    "upgrades": false,
     "//": "no GUILT_CHILD because it no longer looks enough like a child to evoke pity"
   },
   {
@@ -68,8 +69,9 @@
     "bleed_rate": 50,
     "vision_day": 10,
     "vision_night": 10,
-    "//": "no GUILT_CHILD because it no longer looks enough like a child to evoke pity",
-    "extend": { "weakpoint_sets": [ "wps_eyes_big" ], "flags": [ "CLIMBS" ], "special_attacks": [ [ "SHRIEK", 5 ] ] }
+    "upgrades": false,
+    "extend": { "weakpoint_sets": [ "wps_eyes_big" ], "flags": [ "CLIMBS" ], "special_attacks": [ [ "SHRIEK", 5 ] ] },
+    "//": "no GUILT_CHILD because it no longer looks enough like a child to evoke pity"
   },
   {
     "id": "mon_zombie_shriekling",
@@ -85,6 +87,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "bleed_rate": 50,
     "vision_night": 5,
+    "upgrades": false,
     "extend": { "special_attacks": [ [ "SHRIEK", 5 ] ] }
   },
   {
@@ -99,6 +102,7 @@
     "dodge": 1,
     "bleed_rate": 50,
     "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" },
+    "upgrades": false,
     "armor": { "bash": 1, "electric": 1 }
   },
   {
@@ -115,12 +119,13 @@
     "bleed_rate": 50,
     "vision_day": 10,
     "vision_night": 10,
-    "//": "no GUILT because it no longer looks enough like a child to evoke pity",
+    "upgrades": false,
     "extend": {
       "weakpoint_sets": [ "wps_eyes_big" ],
       "flags": [ "CLIMBS" ],
       "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 5 } ]
-    }
+    },
+    "//": "no GUILT_CHILD because it no longer looks enough like a child to evoke pity"
   },
   {
     "id": "mon_zombie_waif",
@@ -136,6 +141,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "bleed_rate": 50,
     "death_function": { "effect": { "id": "death_guilt", "min_level": 6 } },
+    "upgrades": false,
     "extend": { "flags": [ "GUILT_CHILD" ], "special_attacks": [ [ "SHRIEK", 15 ] ] },
     "//": "GUILT_CHILD because it still looks enough like a child to evoke pity"
   },
@@ -162,6 +168,7 @@
       }
     ],
     "fungalize_into": "mon_fungal_wretch",
+    "upgrades": false,
     "flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "NO_BREATHE", "FILTHY" ]
   }
 ]
diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json
@@ -238,6 +238,7 @@
       { "id": "grab", "cooldown": 4 },
       { "id": "scratch_humanoid", "damage_max_instance": [ { "damage_type": "cut", "amount": 12 } ] }
     ],
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 2, "bullet": 2, "electric": 1 },
     "extend": { "flags": [ "SMELLS", "KEENNOSE" ] }
   },
@@ -280,6 +281,7 @@
     "//": "the headless horror is technically blind, but its feelers allow it to sense your presence if you're close to it",
     "weakpoint_sets": [ "wps_humanoid_body_headless" ],
     "grab_strength": 50,
+    "upgrades": false,
     "armor": { "electric": 2 },
     "extend": { "flags": [ "GOODHEARING", "NOHEAD", "LOUDMOVES" ], "families": [ "prof_wp_hulk" ] },
     "delete": { "special_attacks": [ "bite_humanoid" ] }
@@ -296,13 +298,10 @@
     "material": [ "flesh", "bone" ],
     "color": "red_white",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "melee_skill": 4,
     "melee_dice": 3,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
     "bleed_rate": 80,
-    "vision_night": 3,
     "grab_strength": 15,
     "upgrades": { "half_life": 24, "into": "mon_zombie_brute" },
     "fungalize_into": "mon_zombie_tough_fungal",
@@ -365,7 +364,6 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "dodge": 3,
     "bleed_rate": 50,
-    "vision_night": 3,
     "harvest": "zombie_grabber",
     "grab_strength": 37,
     "special_attacks": [
@@ -378,6 +376,7 @@
       { "id": "drag_followup", "grab_data": { "drag_distance": 1, "drag_deviation": 1, "drag_movecost_mod": 1.5 } }
     ],
     "burn_into": "mon_zombie_fiend",
+    "upgrades": false,
     "armor": { "bash": 10, "cut": 14, "stab": 8, "bullet": 8, "electric": 2 },
     "extend": { "flags": [ "SMELLS", "PUSH_VEH", "RANGED_ATTACKER" ], "weakpoint_sets": [ "wps_humanoid_head_small" ] }
   },
@@ -408,6 +407,7 @@
       { "id": "cut_throat" }
     ],
     "burn_into": "mon_zombie_fiend",
+    "upgrades": false,
     "armor": { "bash": 8, "cut": 5, "bullet": 4, "electric": 2 },
     "extend": { "flags": [ "SMELLS", "PUSH_VEH", "NIGHT_INVISIBILITY" ], "weakpoint_sets": [ "wps_humanoid_head_small" ] }
   },
@@ -445,6 +445,7 @@
       { "id": "grab_drag" },
       { "id": "drag_followup" }
     ],
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 5, "bullet": 4, "electric": 1 },
     "extend": { "flags": [ "SMELLS", "CLIMBS", "NIGHT_INVISIBILITY" ] }
   },
@@ -493,6 +494,7 @@
     "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" }, { "id": "smash" } ],
     "death_drops": "mon_zombie_hulk_death_drops",
     "regenerates": 15,
+    "upgrades": false,
     "armor": { "bash": 15, "cut": 15, "bullet": 15, "electric": 6 },
     "extend": {
       "flags": [ "ALL_SEEING", "GOODHEARING", "SMELLS", "KEENNOSE", "DESTROYS", "PUSH_VEH", "NEMESIS", "LOUDMOVES" ],
@@ -515,7 +517,6 @@
     "dodge": 1,
     "bleed_rate": 50,
     "vision_day": 30,
-    "vision_night": 3,
     "harvest": "zombie_grabber",
     "grab_strength": 50,
     "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ],
@@ -547,6 +548,7 @@
       { "id": "drag_followup" },
       { "id": "bite_humanoid", "cooldown": 5 }
     ],
+    "upgrades": false,
     "extend": { "flags": [ "SMELLS", "RANGED_ATTACKER" ] }
   },
   {
@@ -559,21 +561,19 @@
     "color": "black_white",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
     "melee_skill": 6,
-    "melee_dice": 2,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
     "dodge": 4,
     "bleed_rate": 0,
     "vision_day": 30,
-    "vision_night": 3,
     "harvest": "zombie_meatslug",
-    "grab_strength": 20,
     "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "stretch_bite" }, { "id": "stretch_attack", "cooldown": 5 } ],
     "death_function": {
       "message": "The %s splits in two!",
       "corpse_type": "NO_CORPSE",
       "effect": { "id": "death_blobsplit", "hit_self": true }
     },
+    "upgrades": false,
     "armor": { "bash": 8, "cut": 4, "stab": 10, "bullet": 10, "electric": 1 },
     "extend": { "flags": [ "SMELLS" ] }
   },
@@ -600,6 +600,7 @@
     "grab_strength": 50,
     "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid" }, { "id": "smash", "throw_strength": 96 } ],
     "death_drops": "mon_zombie_hulk_death_drops",
+    "upgrades": false,
     "armor": { "bash": 8, "cut": 12, "bullet": 10, "electric": 5 },
     "extend": {
       "flags": [ "SMELLS", "PUSH_VEH", "DESTROYS" ],
@@ -617,7 +618,6 @@
     "speed": 110,
     "color": "brown",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "melee_skill": 4,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 3,
@@ -652,7 +652,6 @@
     "speed": 100,
     "color": "light_green_cyan",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "melee_skill": 4,
     "melee_dice": 3,
     "melee_dice_sides": 5,
     "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
@@ -680,6 +679,7 @@
     ],
     "death_drops": "mon_zombie_swimmer_death_drops",
     "burn_into": "mon_zombie_scorched",
+    "upgrades": false,
     "armor": { "bash": 8, "cut": 10, "bullet": 8, "electric": 1 },
     "extend": { "flags": [ "SMELLS", "SWIMS", "WATER_CAMOUFLAGE" ] }
   },
@@ -704,6 +704,7 @@
     "path_settings": { "max_dist": 10, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true },
     "special_attacks": [ [ "UPGRADE", 10 ] ],
     "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ],
+    "upgrades": false,
     "armor": { "bash": 2, "cut": 2, "bullet": 2, "electric": 3 },
     "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER_1" ] },
     "delete": { "flags": [ "STUMBLES" ] }
@@ -720,7 +721,6 @@
     "color": "dark_gray",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
     "aggression": 5,
-    "melee_skill": 4,
     "melee_dice": 3,
     "melee_dice_sides": 6,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
@@ -731,6 +731,7 @@
     "path_settings": { "max_dist": 10, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true },
     "special_attacks": [ [ "RESURRECT", 0 ] ],
     "anger_triggers": [ "HURT", "PLAYER_CLOSE", "PLAYER_WEAK" ],
+    "upgrades": false,
     "armor": { "electric": 2 },
     "extend": { "flags": [ "SMELLS", "HAS_MIND", "CAN_OPEN_DOORS", "PRIORITIZE_TARGETS", "NO_FUNG_DMG", "PATH_AVOID_DANGER_1" ] },
     "delete": { "flags": [ "STUMBLES" ] }
@@ -756,7 +757,6 @@
     "copy-from": "mon_zombie_base",
     "speed": 105,
     "color": "brown_white",
-    "melee_skill": 4,
     "melee_dice": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "dodge": 1,
@@ -783,11 +783,11 @@
     "speed": 90,
     "color": "red_cyan",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "melee_skill": 4,
     "melee_dice": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "dodge": 1,
     "regenerates": 12,
+    "upgrades": false,
     "extend": { "flags": [ "SMELLS", "REVIVES_HEALTHY", "NO_NECRO" ] }
   },
   {
@@ -819,6 +819,7 @@
       },
       { "id": "impale" }
     ],
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 5, "bullet": 4, "electric": 1 }
   },
   {
@@ -843,6 +844,7 @@
     "harvest": "zombie_screamer",
     "grab_strength": 15,
     "special_attacks": [ { "id": "grab" }, [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 1 ], { "id": "scratch_humanoid" } ],
+    "upgrades": false,
     "extend": { "flags": [ "SMELLS", "KEENNOSE" ] }
   },
   {
@@ -853,8 +855,6 @@
     "copy-from": "mon_zombie_base",
     "color": "light_gray",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "aggression": 100,
-    "morale": 100,
     "vision_day": 3,
     "vision_night": 40,
     "harvest": "zombie_humanoid_shadow",
@@ -906,6 +906,7 @@
       { "id": "scratch_humanoid", "cooldown": 15 },
       { "id": "bite_humanoid", "cooldown": 5, "min_mul": 0.75, "max_mul": 1.5 }
     ],
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 3, "bullet": 2, "electric": 2 },
     "extend": { "flags": [ "GOODHEARING", "NOHEAD" ] }
   },
@@ -925,6 +926,7 @@
     "bleed_rate": 125,
     "vision_day": 1000,
     "special_attacks": [ { "id": "grab", "cooldown": 6 }, { "id": "scratch_humanoid", "cooldown": 15 } ],
+    "upgrades": false,
     "armor": { "bash": 5, "cut": 3, "bullet": 2, "electric": 2 }
   },
   {
@@ -976,6 +978,7 @@
       { "id": "grab_drag" },
       { "id": "drag_followup" }
     ],
+    "upgrades": false,
     "armor": { "bash": 2, "cut": 8, "stab": 8, "heat": 5, "bullet": 10, "electric": 2 },
     "extend": { "flags": [ "HARDTOSHOOT", "PUSH_VEH", "RANGED_ATTACKER" ], "weakpoint_sets": [ "wps_humanoid_head_small" ] }
   },
@@ -1025,7 +1028,6 @@
     "speed": 75,
     "color": "i_light_cyan",
     "melee_skill": 5,
-    "melee_dice_sides": 3,
     "vision_day": 15,
     "vision_night": 2,
     "death_drops": "mon_zombie_technician_death_drops",
@@ -1043,7 +1045,6 @@
     "speed": 75,
     "color": "i_light_cyan",
     "melee_skill": 5,
-    "melee_dice_sides": 3,
     "vision_day": 15,
     "vision_night": 2,
     "death_drops": "mon_zombie_miner_death_drops",
@@ -1069,6 +1070,7 @@
     "attack_effs": [ { "id": "paralyzepoison", "duration": 33 } ],
     "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" }, [ "PARA_STING", 30 ] ],
     "death_drops": "mon_zombie_thorny_death_drops",
+    "upgrades": false,
     "armor": { "bash": 2, "cut": 4, "bullet": 3, "electric": 1 },
     "extend": { "flags": [ "SMELLS", "RANGED_ATTACKER", "PARALYZEVENOM" ] }
   },