Skip to content

Commit

Permalink
Merge pull request #78313 from LyleSY/dusted_tough_child_fat_rot_brain
Browse files Browse the repository at this point in the history
fungalize stages for rest of zombies
  • Loading branch information
akrieger authored Dec 11, 2024
2 parents 0785c43 + 37e57a4 commit 651881e
Show file tree
Hide file tree
Showing 11 changed files with 582 additions and 27 deletions.
554 changes: 553 additions & 1 deletion data/json/monsters/fungus_zombie.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions data/json/monsters/zed-classic.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_clothes", 100 ], [ "hive", 80 ] ] },
"fungalize_into": "mon_beekeeper_fungal",
"fungalize_into": "mon_beekeeper_dusted",
"upgrades": false,
"armor": { "bash": 6, "cut": 8, "bullet": 6, "electric": 1 },
"extend": { "weakpoint_sets": [ "wps_natural_armor" ], "families": [ "prof_wp_nat_armored" ] }
Expand Down Expand Up @@ -109,7 +109,7 @@
{ "id": "bite_humanoid", "attack_upper": false, "cooldown": 5 },
{ "id": "scratch_humanoid", "attack_upper": false }
],
"fungalize_into": "mon_zombie_crawler_fungal",
"fungalize_into": "mon_zombie_crawler_dusted",
"upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBIE_CRAWLER_UPGRADE" },
"extend": { "flags": [ "ATTACK_LOWER", "GEN_DORMANT" ] },
"delete": { "flags": [ "PUSH_MON" ] }
Expand All @@ -126,7 +126,7 @@
"color": "green",
"melee_skill": 3,
"melee_dice_sides": 4,
"fungalize_into": "mon_zombie_fat_fungus",
"fungalize_into": "mon_zombie_fat_dusted",
"upgrades": { "half_life": 32, "into_group": "GROUP_ZOMBIE_FAT" },
"armor": { "bash": 5, "cut": 3, "bullet": 2, "electric": 2 },
"extend": { "weakpoint_sets": [ "wps_humanoid_head_small" ], "flags": [ "GEN_DORMANT" ] }
Expand Down Expand Up @@ -186,7 +186,7 @@
"melee_skill": 1,
"melee_dice_sides": 2,
"grab_strength": 15,
"fungalize_into": "mon_zombie_rot_fungal",
"fungalize_into": "mon_zombie_rot_dusted",
"upgrades": { "half_life": 43, "into": "mon_devourer" },
"extend": { "flags": [ "GEN_DORMANT" ] }
},
Expand Down Expand Up @@ -224,7 +224,7 @@
{ "id": "bite_humanoid", "cooldown": 5, "min_mul": 0.7 },
{ "id": "scratch_humanoid" }
],
"fungalize_into": "mon_zombie_tough_fungal",
"fungalize_into": "mon_zombie_tough_dusted",
"armor": { "bash": 2, "cut": 1, "bullet": 1, "electric": 2 },
"extend": { "weakpoint_sets": [ "wps_humanoid_head_small" ], "flags": [ "GEN_DORMANT" ] }
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed-winged.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"decay": "zombie_decay_bone",
"special_attacks": [ { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } ],
"upgrades": { "half_life": 42, "into_group": "GROUP_ZOMBIE_RAPTOR_UPGRADES" },
"fungalize_into": "mon_fungal_raptor",
"fungalize_into": "mon_spawn_raptor_dusted",
"flags": [
"SEES",
"HEARS",
Expand Down
6 changes: 3 additions & 3 deletions data/json/monsters/zed_acid.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"harvest": "zombie_humanoid_acid",
"death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
"upgrades": { "half_life": 30, "into": "mon_zombie_spitter" },
"fungalize_into": "mon_zombie_fungus_acidic",
"fungalize_into": "mon_zombie_acidic_dusted",
"extend": { "flags": [ "ACIDPROOF", "ACID_BLOOD" ], "special_attacks": [ [ "ACID_BARF", 10 ] ] }
},
{
Expand Down Expand Up @@ -56,7 +56,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",
"fungalize_into": "mon_zombie_acidic_dusted",
"upgrades": false,
"armor": { "bash": 10, "cut": 2, "stab": 12, "bullet": 2, "electric": 2 },
"extend": {
Expand All @@ -83,7 +83,7 @@
"special_attacks": [ [ "ACID", 20 ] ],
"death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
"upgrades": { "half_life": 42, "into": "mon_zombie_corrosive" },
"fungalize_into": "mon_zombie_fungus_acidic",
"fungalize_into": "mon_zombie_acidic_dusted",
"extend": { "flags": [ "ACIDPROOF", "ACID_BLOOD", "RANGED_ATTACKER" ], "weakpoint_sets": [ "wps_humanoid_head_big" ] }
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/zed_children.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"//": "default zombie children clothing (always), additional items from child_items_pockets (sometimes)"
},
"burn_into": "mon_zombie_child_scorched",
"fungalize_into": "mon_zombie_child_fungus",
"fungalize_into": "mon_zombie_child_dusted",
"upgrades": { "half_life": 30, "into_group": "GROUP_CHILD_ZOMBIE_UPGRADE" },
"extend": { "weakpoint_sets": [ "wps_humanoid_child_body", "wps_humanoid_head_big" ], "families": [ "prof_wp_child" ] },
"delete": { "flags": [ "PUSH_MON" ] }
Expand Down Expand Up @@ -171,7 +171,7 @@
"monster_message": "Ripping and tearing, a small beast burrows free of the wretch's abdomen!"
}
],
"fungalize_into": "mon_fungal_wretch",
"fungalize_into": "mon_zombie_wretch_dusted",
"upgrades": false,
"flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "NO_BREATHE", "FILTHY" ]
}
Expand Down
2 changes: 2 additions & 0 deletions data/json/monsters/zed_command.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"vision_day": 30,
"vision_night": 3,
"harvest": "mr_bones",
"fungalize_into": "mon_skeleton_dusted",
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 24, "electric": 3 },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
},
Expand All @@ -32,6 +33,7 @@
"vision_day": 30,
"vision_night": 3,
"harvest": "mr_bones",
"fungalize_into": "mon_skeleton_brute_dusted",
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 24, "electric": 3 },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/zed_explosive.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] },
"death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" },
"upgrades": { "half_life": 42, "into_group": "GROUP_ZOMBIE_BOOMER_UPGRADE" },
"fungalize_into": "mon_boomer_fungus",
"fungalize_into": "mon_boomer_dusted",
"armor": { "electric": 2 },
"extend": { "flags": [ "BILE_BLOOD" ], "weakpoint_sets": [ "wps_humanoid_head_small" ], "special_attacks": [ [ "BOOMER", 20 ] ] }
},
Expand Down Expand Up @@ -80,7 +80,7 @@
"emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ],
"special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ],
"death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" },
"fungalize_into": "mon_zombie_gasbag_fungus",
"fungalize_into": "mon_gasbag_dusted",
"armor": { "electric": 1 },
"delete": { "flags": [ "BILE_BLOOD", "BASHES", "GROUP_BASH" ], "special_attacks": [ "BOOMER" ] }
},
Expand Down
12 changes: 6 additions & 6 deletions data/json/monsters/zed_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"bleed_rate": 80,
"grab_strength": 15,
"upgrades": { "half_life": 24, "into": "mon_zombie_brute" },
"fungalize_into": "mon_zombie_tough_fungal",
"fungalize_into": "mon_zombie_tough_dusted",
"armor": { "bash": 3, "cut": 2, "bullet": 2, "electric": 2 },
"extend": {
"flags": [ "SMELLS", "PUSH_VEH" ],
Expand Down Expand Up @@ -138,7 +138,7 @@
"grab_strength": 30,
"burn_into": "mon_zombie_scorched_brute",
"upgrades": { "half_life": 42, "into_group": "GROUP_ZOMBIE_BRUTE" },
"fungalize_into": "mon_zombie_brute_fungal",
"fungalize_into": "mon_zombie_brute_dusted",
"armor": { "bash": 4, "cut": 6, "bullet": 5, "electric": 2 },
"extend": {
"flags": [ "SMELLS", "PUSH_VEH" ],
Expand Down Expand Up @@ -292,7 +292,7 @@
"death_function": { "eoc": "EOC_NEMESIS_DIED" },
"upgrades": false,
"armor": { "bash": 15, "cut": 15, "bullet": 15, "electric": 6 },
"fungalize_into": "mon_zombie_hulk_fungal",
"fungalize_into": "mon_zombie_hulk_dusted",
"extend": {
"flags": [ "ALL_SEEING", "GOODHEARING", "SMELLS", "KEENNOSE", "DESTROYS", "PUSH_VEH", "NEMESIS", "LOUDMOVES" ],
"weakpoint_sets": [ "wps_humanoid_head_small" ],
Expand Down Expand Up @@ -406,7 +406,7 @@
"special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid" }, { "id": "smash", "throw_strength": 96 } ],
"death_drops": "mon_zombie_hulk_death_drops",
"burn_into": "mon_zombie_fiend",
"fungalize_into": "mon_zombie_hulk_fungal",
"fungalize_into": "mon_zombie_hulk_dusted",
"upgrades": false,
"armor": { "bash": 8, "cut": 12, "bullet": 10, "electric": 5 },
"extend": {
Expand Down Expand Up @@ -580,7 +580,7 @@
}
],
"upgrades": { "half_life": 35, "into": "mon_zombie_hunter" },
"fungalize_into": "mon_zombie_runner_fungal"
"fungalize_into": "mon_zombie_runner_dusted"
},
{
"id": "mon_zombie_regenerating",
Expand Down Expand Up @@ -799,7 +799,7 @@
"vision_day": 50,
"emit_fields": [ { "emit_id": "emit_smoke_stream", "delay": "1 s" } ],
"death_function": { "effect": { "id": "death_smokeburst", "hit_self": true }, "message": "The %s explodes!" },
"fungalize_into": "mon_zombie_smoker_fungus",
"fungalize_into": "mon_zombie_smoker_dusted",
"upgrades": { "half_life": 30, "into": "mon_smoker_brute" },
"armor": { "heat": 5, "electric": 1 },
"extend": { "flags": [ "HARDTOSHOOT" ] }
Expand Down
12 changes: 6 additions & 6 deletions data/json/monsters/zed_skeletal.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"harvest": "mr_bones",
"special_attacks": [ { "id": "grab", "cooldown": 21 }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid", "cooldown": 5 } ],
"upgrades": { "half_life": 32, "into_group": "GROUP_SKELETON_UPGRADE" },
"fungalize_into": "mon_skeleton_fungus",
"fungalize_into": "mon_skeleton_dusted",
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 24, "electric": 3 },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
},
Expand Down Expand Up @@ -48,7 +48,7 @@
}
],
"upgrades": { "half_life": 45, "into": "mon_skeleton_hulk" },
"fungalize_into": "mon_skeleton_brute_fungus",
"fungalize_into": "mon_skeleton_brute_dusted",
"armor": { "bash": 12, "cut": 30, "acid": 1, "bullet": 30, "electric": 4 },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
},
Expand All @@ -74,7 +74,7 @@
[ "PARROT", 8 ]
],
"special_when_hit": [ "ZAPBACK", 100 ],
"fungalize_into": "mon_skeleton_fungus",
"fungalize_into": "mon_skeleton_dusted",
"upgrades": false,
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 30 },
"extend": {
Expand Down Expand Up @@ -109,7 +109,7 @@
"damage_max_instance": [ { "damage_type": "cut", "amount": 23, "armor_multiplier": 0.8 } ]
}
],
"fungalize_into": "mon_skeleton_hulk_fungus",
"fungalize_into": "mon_skeleton_hulk_dusted",
"armor": { "bash": 20, "cut": 45, "bullet": 36, "electric": 8 },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
},
Expand Down Expand Up @@ -163,7 +163,7 @@
"scents_tracked": [ "sc_human", "sc_fetid" ],
"special_attacks": [ { "id": "cut_throat", "damage_max_instance": [ { "damage_type": "cut", "amount": 40 } ], "cooldown": 15 } ],
"upgrades": { "half_life": 32, "into": "mon_skeleton_reaper" },
"fungalize_into": "mon_skeleton_brute_fungus",
"fungalize_into": "mon_skeleton_brute_dusted",
"burn_into": "mon_zombie_scorched_brute",
"armor": { "bash": 10, "cut": 35, "stab": 30, "acid": 4, "bullet": 25, "electric": 5 },
"extend": { "flags": [ "SMELLS" ] },
Expand All @@ -190,7 +190,7 @@
{ "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 40 } ], "cooldown": 20 }
],
"upgrades": false,
"fungalize_into": "mon_skeleton_brute_fungus",
"fungalize_into": "mon_skeleton_brute_dusted",
"burn_into": "mon_zombie_scorched_brute",
"armor": { "bash": 15, "cut": 35, "stab": 35, "acid": 4, "bullet": 30, "electric": 5 },
"extend": { "flags": [ "PUSH_VEH" ] },
Expand Down
2 changes: 1 addition & 1 deletion doc/MONSTERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ These properties are required for all monsters:

Property | Description
--- | ---
`name` | (string or object) Monster name, and optional plural name and translation context
`name` | (string or object) Monster name, and optional plural name and translation context. Three words maximum.
`description` | (string) In-game description of the monster, in one or two sentences
`hp` | (integer) Hit points. Also see [monster HP scaling in GAME_BALANCE.md](GAME_BALANCE.md#monster-hp-scaling)
`volume` | (string) Volume of the creature's body, as an integer with metric units, ex. `"35 L"` or `"1500 ml"`. Used to calculate monster size, size influences melee hit chances on different-sized targets.
Expand Down
1 change: 1 addition & 0 deletions tools/spell_checker/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2163,6 +2163,7 @@ Fuji
fulleroclathrate
fullscreen
fumarolic
fungalizing
fungaloid
fungaloids
fungideer
Expand Down

0 comments on commit 651881e

Please sign in to comment.