diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 4edd9701cccd1..52193d5adf5db 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -89,6 +89,50 @@ "max_field_intensity": 3, "field_chance": 1 }, + { + "id": "death_sludge", + "type": "SPELL", + "name": { "str": "Sludge Death" }, + "description": "Sludge sprays out of a dead monster.", + "valid_targets": [ "ground", "self", "hostile", "ally" ], + "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ], + "shape": "blast", + "effect": "attack", + "min_duration": 2400, + "max_duration": 2400, + "effect_str": "sludged", + "field_id": "fd_sludge", + "min_field_intensity": 3, + "max_field_intensity": 3, + "field_chance": 1, + "min_aoe": 1, + "max_aoe": 2, + "aoe_increment": 1, + "max_level": 1, + "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] + }, + { + "id": "death_sludge_mega", + "type": "SPELL", + "name": { "str": "Mega Sludge Death" }, + "description": "A large amount of sludge sprays out of a dead monster.", + "valid_targets": [ "ground", "self", "hostile", "ally" ], + "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ], + "shape": "blast", + "effect": "attack", + "min_duration": 2400, + "max_duration": 2400, + "effect_str": "sludged", + "field_id": "fd_sludge", + "min_field_intensity": 3, + "max_field_intensity": 3, + "field_chance": 1, + "min_aoe": 3, + "max_aoe": 3, + "aoe_increment": 1, + "max_level": 1, + "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] + }, { "id": "death_blood", "type": "SPELL", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 901f90397dae9..f38b1d8e65bf2 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -130,5 +130,20 @@ { "item": "dinosuit", "prob": 50, "damage": [ 2, 3 ] }, { "item": "sharksuit", "prob": 50, "damage": [ 2, 3 ] } ] + }, + { + "type": "item_group", + "id": "explode_toad", + "subtype": "collection", + "entries": [ + { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, + { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, + { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "mutant_brain", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, + { "item": "stomach_large", "prob": 80, "damage": [ 2, 3 ] } + ] } ] diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json index 1886067195f6f..ec0080bbba902 100644 --- a/data/json/monstergroups/zombies.json +++ b/data/json/monstergroups/zombies.json @@ -608,10 +608,29 @@ "type": "monstergroup", "name": "GROUP_ZOMBULL_FROG_UPGRADE", "monsters": [ + { "monster": "mon_zombullfrog", "weight": 100, "cost_multiplier": 3 }, { "monster": "mon_frog_dad", "weight": 75, "cost_multiplier": 3 }, { "monster": "mon_frog_mother", "weight": 25, "cost_multiplier": 1 } ] }, + { + "type": "monstergroup", + "name": "GROUP_DEADTOAD_UPGRADE", + "monsters": [ + { "monster": "mon_toad_bloat", "weight": 25, "cost_multiplier": 1 }, + { "monster": "mon_toad_wart", "weight": 25, "cost_multiplier": 1 }, + { "monster": "mon_toad_bone", "weight": 25, "cost_multiplier": 1 }, + { "monster": "mon_gastro_bufo", "weight": 25, "cost_multiplier": 1 } + ] + }, + { + "type": "monstergroup", + "name": "GROUP_ZOMBTREEFROG_UPGRADE", + "monsters": [ + { "monster": "mon_zombtreefrog", "weight": 75, "cost_multiplier": 3 }, + { "monster": "mon_frog_shadow", "weight": 25, "cost_multiplier": 3 } + ] + }, { "type": "monstergroup", "name": "GROUP_MANSION_POOL", diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index dfd955a7ba1bf..54d108176e1f4 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -705,7 +705,6 @@ ], "fear_triggers": [ "FRIEND_DIED", "FIRE", "SOUND" ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ], - "zombify_into": "mon_zombullfrog", "baby_flags": [ "SPRING", "SUMMER" ], "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWARMS", "SWIMS", "WATER_CAMOUFLAGE", "CLIMBS" ] }, @@ -718,6 +717,7 @@ "color": "light_green", "aggression": 0, "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_STRANGE" }, + "zombify_into": "mon_zombullfrog", "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 12, "baby_timer": 20 }, "delete": { "flags": [ "SWARMS" ] } }, @@ -729,6 +729,7 @@ "copy-from": "mon_proxy_bigfrog", "aggression": 0, "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_ODD" }, + "zombify_into": "mon_toad_zombie", "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 12, "baby_timer": 20 }, "extend": { "flags": [ "POISON" ] }, "delete": { "flags": [ "SWARMS" ] } @@ -752,6 +753,7 @@ "luminance": 3, "special_when_hit": [ "ZAPBACK", 100 ], "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_PATTERN" }, + "zombify_into": "mon_frog_shocker", "reproduction": { "baby_egg": "egg_pattern_frog", "baby_count": 12, "baby_timer": 20 } }, { @@ -779,6 +781,7 @@ } ], "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_FOUL" }, + "zombify_into": "mon_toad_zombie", "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 12, "baby_timer": 20 }, "extend": { "flags": [ "POISON", "NO_BREATHE" ] }, "//": "When possible, add an AOE burst & temporary trail of slippery, toxic grease on several hour cooldown. The toad can expel grease like a squid with ink. The grease offgasses into something between tear gas and a blister agent, hence the smell. NO_BREATHE flag is to prevent self-gassing." @@ -810,6 +813,7 @@ ], "fear_triggers": [ "HURT", "FRIEND_DIED", "FIRE", "SOUND" ], "anger_triggers": [ "PLAYER_CLOSE", "MATING_SEASON" ], + "zombify_into": "mon_zombtreefrog", "reproduction": { "baby_egg": "egg_vocal_frog", "baby_count": 12, "baby_timer": 20 }, "delete": { "flags": [ "SWARMS" ] }, "harvest": "bullfrog", @@ -845,6 +849,7 @@ "dodge": 6, "armor": { "bash": 5, "acid": 2, "heat": 5, "electric": 4 }, "vision_night": 35, + "zombify_into": "mon_frog_shadow", "reproduction": { "baby_egg": "egg_shift_frog", "baby_count": 12, "baby_timer": 20 }, "extend": { "flags": [ "CAMOUFLAGE" ] }, "//": "Give climbing (Z axis) ability when available." @@ -904,7 +909,6 @@ ], "fear_triggers": [ "FIRE" ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ], - "zombify_into": "mon_zombullfrog", "baby_flags": [ "SPRING", "SUMMER" ], "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "GRABS", "SWIMS", "WATER_CAMOUFLAGE", "CLIMBS", "BASHES" ] }, @@ -916,6 +920,7 @@ "copy-from": "mon_proxy_giganfrog", "color": "light_green", "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_STRANGE_MEGA" }, + "zombify_into": "mon_zombullfrog", "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 18, "baby_timer": 20 } }, { @@ -925,7 +930,7 @@ "description": "This toad has grown bigger than a human. It looks uninterested in eating you but you better not give it a chance.", "copy-from": "mon_proxy_giganfrog", "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_ODD_MEGA" }, - "zombify_into": "mon_gastro_bufo", + "zombify_into": "mon_toad_zombie", "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 18, "baby_timer": 20 }, "extend": { "flags": [ "POISON" ] } }, @@ -973,6 +978,7 @@ ], "special_when_hit": [ "ZAPBACK", 100 ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON", "FRIEND_ATTACKED" ], + "zombify_into": "mon_frog_shocker", "reproduction": { "baby_egg": "egg_pattern_frog", "baby_count": 18, "baby_timer": 20 }, "extend": { "flags": [ "SWARMS" ] } }, @@ -1014,7 +1020,7 @@ ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON", "FRIEND_ATTACKED" ], "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_FOUL_MEGA" }, - "zombify_into": "mon_gastro_bufo", + "zombify_into": "mon_toad_zombie", "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 18, "baby_timer": 20 }, "extend": { "flags": [ "POISON", "NO_BREATHE", "SWARMS" ] }, "//": "When possible, add ability to dig furrows (lines of shallow pits) and wallow. NO_BREATHE flag is to prevent gassing by younger of its kind." @@ -1074,7 +1080,6 @@ ], "fear_triggers": [ "FIRE" ], "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ], - "zombify_into": "mon_frog_dad", "baby_flags": [ "SPRING", "SUMMER" ], "flags": [ "SEES", "SMELLS", "GRABS", "HEARS", "SWIMS", "DESTROYS" ] }, @@ -1109,6 +1114,7 @@ [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 5 ] ], + "zombify_into": "mon_frog_dad", "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 32, "baby_timer": 20 } }, { @@ -1118,7 +1124,7 @@ "description": "This toad is of truly enormous stature, larger than many cars. You can't help but wonder if it could fit as many people inside.", "copy-from": "mon_proxy_megafrog", "armor": { "bash": 18, "cut": 18, "bullet": 12, "electric": 4 }, - "zombify_into": "mon_gastro_bufo", + "zombify_into": "mon_toad_wart", "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 32, "baby_timer": 20 }, "extend": { "flags": [ "POISON" ] }, "//": "Simple wallowing, likes to create deep pits and lay in them." @@ -1153,7 +1159,7 @@ { "damage_type": "cut", "amount": 26, "armor_multiplier": 0.2 }, { "damage_type": "bash", "amount": 14, "armor_multiplier": 0.2 } ], - "effects": [ { "id": "paralyzepoison", "duration": 20, "affect_hit_bp": true } ], + "effects": [ { "id": "venom_pain", "duration": 20, "affect_hit_bp": true } ], "condition": { "not": { "u_has_effect": "maimed_mandible" } } }, { @@ -1178,7 +1184,7 @@ } ], "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON", "FRIEND_ATTACKED" ], - "zombify_into": "mon_gastro_bufo", + "zombify_into": "mon_toad_bone", "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 32, "baby_timer": 20 }, "extend": { "flags": [ "POISON", "NO_BREATHE" ] }, "//": "When possible, add ability to dig furrows (lines of shallow pits) and wallow. NO_BREATHE flag is to prevent gassing by younger of its kind." diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json index 04d13a7a99923..7f878cc53ce4b 100644 --- a/data/json/monsters/zed-animal.json +++ b/data/json/monsters/zed-animal.json @@ -811,47 +811,32 @@ "type": "MONSTER", "name": { "str": "gastro bufo" }, "description": "A massive toad stumbling around while leaking acid from its skin. Doesn't look friendly at all.", - "default_faction": "zombie", - "species": [ "ZOMBIE", "AMPHIBIAN" ], + "copy-from": "mon_proxy_frog_zombie", "volume": "200 L", "weight": "280 kg", "hp": 200, "speed": 75, "attack_cost": 75, - "material": [ "flesh" ], - "symbol": "F", - "color": "black_green", - "aggression": 100, - "morale": 100, - "melee_skill": 5, - "melee_dice": 5, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], + "symbol": "R", "dodge": 2, - "vision_night": 7, - "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie" ], "harvest": "zombie_animal_acid", - "path_settings": { "max_dist": 5 }, - "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ], + "emit_fields": [ { "emit_id": "emit_acid_drop", "delay": "1 s" } ], + "special_attacks": [ + { + "type": "leap", + "cooldown": 10, + "move_cost": 0, + "max_range": 10, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" }, + [ "ACID_BARF", 5 ] + ], "special_when_hit": [ "ACIDSPLASH", 100 ], "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } }, - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "KEENNOSE", - "STUMBLES", - "WARM", - "BASHES", - "POISON", - "NO_BREATHE", - "REVIVES", - "PUSH_MON", - "FILTHY", - "ACIDPROOF", - "ACID_BLOOD" - ], - "armor": { "bash": 8, "cut": 2, "bullet": 1 } + "extend": { "flags": [ "POISON", "ACIDPROOF", "ACID_BLOOD" ] }, + "delete": { "flags": [ "RANGED_ATTACKER" ] } } ] diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index b1fc6b83487f2..87f185db90401 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -1,63 +1,115 @@ [ { - "id": "mon_frog_mother", + "abstract": "mon_proxy_frog_zombie", "type": "MONSTER", - "name": { "str": "frog mother" }, - "description": "A large, bulbous creature with an extremely large mouth and small, stubby legs with no feet. Drenched in an oily greenish-black substance, its flesh seems to rapidly decompose and reconstitute itself, and it is covered in large, white pustules that seem ready to pop.", + "name": { "str": "zombie frog" }, + "description": "A hypothetical frog of the zombie variety. You should not be seeing it without debug.", "default_faction": "zombie", + "bodytype": "frog", "species": [ "ZOMBIE" ], - "volume": "240 L", - "weight": "300 kg", - "hp": 400, + "volume": "120 L", + "weight": "150 kg", + "hp": 160, + "bleed_rate": 0, "speed": 60, "material": [ "flesh" ], - "symbol": "F", + "symbol": "M", "color": "black_green", "aggression": 100, "morale": 100, - "melee_skill": 5, - "melee_dice": 5, + "melee_skill": 4, + "melee_dice": 4, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], - "dodge": 2, - "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], + "dodge": 1, + "armor": { "bash": 8, "cut": 2, "bullet": 1, "electric": 2 }, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie" ], - "bleed_rate": 0, - "vision_night": 7, + "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], "harvest": "zombie_animal", - "grab_strength": 40, + "vision_night": 7, "special_attacks": [ - { "type": "leap", "cooldown": 12, "move_cost": 0, "max_range": 4, "min_consider_range": 2 }, - { "id": "ranged_pull", "range": 4 }, - { "id": "grab_drag", "cooldown": 3 }, - { "id": "drag_followup" }, { - "type": "spell", - "spell_data": { "id": "frog_mother_summon" }, - "cooldown": 20, - "monster_message": "Some of the pustules pop, and the frog mother opens her mouth and vomits tadpoles!" - } + "type": "leap", + "cooldown": 12, + "move_cost": 0, + "max_range": 6, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } ], - "regenerates": 40, - "regen_morale": true, "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", - "WARM", "GRABS", + "WARM", "BASHES", "GROUP_BASH", - "POISON", - "GRABS", "NO_BREATHE", "REVIVES", "PUSH_MON", - "FILTHY", "RANGED_ATTACKER" + ] + }, + { + "id": "mon_frog_mother", + "type": "MONSTER", + "name": { "str": "frog mother" }, + "description": "A large, bulbous creature with an extremely large mouth and small, stubby legs with no feet. Drenched in an oily greenish-black substance, its flesh seems to rapidly decompose and reconstitute itself, and it is covered in large, white pustules that seem ready to pop.", + "copy-from": "mon_proxy_frog_zombie", + "volume": "240 L", + "weight": "300 kg", + "hp": 400, + "symbol": "F", + "melee_skill": 5, + "melee_dice": 5, + "dodge": 2, + "grab_strength": 40, + "special_attacks": [ + { + "type": "leap", + "cooldown": 12, + "move_cost": 0, + "max_range": 4, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" }, + { + "type": "spell", + "spell_data": { "id": "frog_mother_summon" }, + "cooldown": 20, + "monster_message": "Some of the pustules pop, and the frog mother opens her mouth and vomits tadpoles!" + } ], + "regenerates": 40, "armor": { "bash": 12, "cut": 2, "bullet": 1, "electric": 2 } }, { @@ -66,6 +118,7 @@ "name": { "str": "tadpole constrictor" }, "description": "The only resemblance this creature bears to a tadpole is its slick black-green skin and slender body. Its three appendages, resembling long tentacles or pseudopods, propel it across the ground at maddening speed. It has no outward sensory organs or a mouth, and steam rises from its skin as if it is burning away its own lifeforce to catch you.", "default_faction": "zombie", + "bodytype": "snake", "species": [ "ZOMBIE" ], "volume": "10 L", "weight": "18 kg", @@ -82,7 +135,7 @@ "dodge": 4, "vision_day": 7, "vision_night": 7, - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], + "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_basic_amphibian" ], "harvest": "exempt", "grab_strength": 15, "special_attacks": [ @@ -94,115 +147,354 @@ "effect": { "id": "death_acid", "hit_self": true }, "corpse_type": "NO_CORPSE" }, - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "WARM", "POISON", "GRABS", "NO_BREATHE", "FILTHY" ] + "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "WARM", "POISON", "GRABS", "NO_BREATHE" ] }, { "id": "mon_zombullfrog", "type": "MONSTER", "name": { "str": "zombullfrog" }, "description": "The wound covered skin of this large bullfrog appears to be peeling in places, revealing a black goop beneath the surface. Its vacant stare passes by anything that isn't food, and it will leap to devour anything it can.", - "default_faction": "zombie", - "species": [ "ZOMBIE" ], - "volume": "120 L", - "weight": "150 kg", - "hp": 160, - "speed": 50, + "copy-from": "mon_proxy_frog_zombie", "attack_cost": 50, - "material": [ "flesh" ], - "symbol": "F", - "color": "black_green", - "aggression": 100, - "morale": 100, - "melee_skill": 4, - "melee_dice": 4, - "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], - "dodge": 1, - "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie" ], - "bleed_rate": 0, - "vision_night": 7, - "harvest": "zombie_animal", - "special_attacks": [ - { "type": "leap", "cooldown": 12, "move_cost": 0, "max_range": 4, "min_consider_range": 2 }, - { "id": "ranged_pull", "range": 4 }, - { "id": "grab_drag", "cooldown": 3 }, - { "id": "drag_followup" } - ], - "regen_morale": true, - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "KEENNOSE", - "STUMBLES", - "GRABS", - "WARM", - "BASHES", - "GROUP_BASH", - "NO_BREATHE", - "REVIVES", - "PUSH_MON", - "RANGED_ATTACKER" - ], - "upgrades": { "half_life": 34, "into_group": "GROUP_ZOMBULL_FROG_UPGRADE" }, - "armor": { "bash": 8, "cut": 2, "bullet": 1, "electric": 2 } + "upgrades": { "half_life": 34, "into_group": "GROUP_ZOMBULL_FROG_UPGRADE" } }, { "id": "mon_frog_dad", "type": "MONSTER", "name": { "str": "colossal zombullfrog" }, - "description": "This gigantic zombified frog lets out an ear splitting unholy wail as it slowly takes notice of you. Its lethargic movements is offset by the gargantuan stout leaping legs", - "default_faction": "zombie", - "species": [ "ZOMBIE" ], + "description": "This gigantic zombified frog lets out an ear splitting unholy wail as it slowly takes notice of you. Its lethargic movements are offset by the gargantuan stout leaping legs", + "copy-from": "mon_proxy_frog_zombie", "volume": "200 L", "weight": "180 kg", "hp": 500, - "speed": 60, "attack_cost": 60, - "material": [ "flesh" ], "symbol": "F", "color": "light_green", - "aggression": 100, - "morale": 100, "grab_strength": 50, "melee_skill": 8, "melee_dice": 6, "melee_dice_sides": 5, - "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], - "dodge": 1, - "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ], - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie" ], - "bleed_rate": 0, "vision_day": 30, - "vision_night": 7, - "harvest": "zombie_animal", "special_attacks": [ - { "type": "leap", "cooldown": 8, "move_cost": 0, "max_range": 8, "min_consider_range": 2 }, - { "id": "ranged_pull", "range": 4 }, + { + "type": "leap", + "cooldown": 8, + "move_cost": 0, + "max_range": 8, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, { "id": "grab_drag", "cooldown": 3 }, { "id": "drag_followup" }, [ "SHRIEK_ALERT", 20 ], [ "SHRIEK_STUN", 5 ] ], - "regen_morale": true, - "flags": [ - "SEES", - "HEARS", - "SMELLS", - "KEENNOSE", - "STUMBLES", - "GRABS", - "WARM", - "BASHES", - "GROUP_BASH", - "NO_BREATHE", - "REVIVES", - "PUSH_MON", - "RANGED_ATTACKER" - ], "armor": { "bash": 15, "cut": 7, "bullet": 5, "electric": 2 } }, + { + "id": "mon_toad_zombie", + "type": "MONSTER", + "name": { "str": "zombie toad" }, + "description": "The revivified remains of a giant mutant toad. Its condition has left it slowed but no less dangerous.", + "copy-from": "mon_proxy_frog_zombie", + "color": "brown_green", + "attack_cost": 50, + "upgrades": { "half_life": 30, "into": "mon_toad_bloat" }, + "extend": { "flags": [ "POISON" ] } + }, + { + "id": "mon_frog_shocker", + "type": "MONSTER", + "name": { "str": "zapping zombfrog" }, + "description": "The hum coming from this giant, rotten frog sounds unlike any kind of vocalization. The sound is clearly a result of the bolts of electricity that skip across its skin and arc between its lips.", + "copy-from": "mon_proxy_frog_zombie", + "speed": 75, + "color": "light_cyan", + "melee_skill": 5, + "melee_dice": 2, + "melee_damage": [ { "damage_type": "electric", "amount": 6 } ], + "dodge": 2, + "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie", "prof_electromagnetics" ], + "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog", "wps_amphibian_electric" ], + "luminance": 16, + "attack_cost": 50, + "special_attacks": [ + { + "type": "leap", + "cooldown": 8, + "move_cost": 0, + "max_range": 6, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "cooldown": 10, + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "damage_max_instance": [ { "damage_type": "electric", "amount": 4 } ], + "effects": [ { "id": "zapped", "duration": [ 2, 10 ] } ], + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" }, + [ "PARROT", 8 ] + ], + "special_when_hit": [ "ZAPBACK", 100 ], + "extend": { "flags": [ "ELECTRIC" ] } + }, + { + "id": "mon_toad_bloat", + "type": "MONSTER", + "name": { "str": "bloated zoad" }, + "description": "This zombified toad wobbles as it drags along its immense, inflated form. A yellow-brown sludge dribbles from its mouth and seeps out from its bulging, cracking skin.", + "copy-from": "mon_proxy_frog_zombie", + "weight": "200 kg", + "hp": 30, + "symbol": "D", + "melee_dice": 2, + "melee_dice_sides": 3, + "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], + "armor": { "bash": 4, "cut": 1 }, + "special_attacks": [ + { + "type": "leap", + "cooldown": 12, + "move_cost": 0, + "max_range": 4, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } + ], + "death_function": { + "message": "The %s's body bursts, expelling sludge.", + "effect": { "id": "death_sludge", "hit_self": true }, + "corpse_type": "NO_CORPSE" + }, + "death_drops": "explode_toad", + "upgrades": { "half_life": 30, "into_group": "GROUP_DEADTOAD_UPGRADE" }, + "extend": { "flags": [ "POISON", "SMALLSLUDGETRAIL", "SLUDGEPROOF" ] }, + "//": "Create new death_sludge effect." + }, + { + "id": "mon_zombtreefrog", + "type": "MONSTER", + "name": { "str": "croaked climber" }, + "description": "The pale, empty eyes of this large, reanimated treefrog still swivel in their sockets, searching for prey. Its steps are ungainly but its hind legs look capable of great leaps.", + "copy-from": "mon_proxy_frog_zombie", + "volume": "80 L", + "weight": "100 kg", + "hp": 90, + "bleed_rate": 50, + "speed": 90, + "symbol": "K", + "color": "brown_green", + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "bash", "amount": 3 } ], + "dodge": 4, + "armor": { "bash": 4, "cut": 2, "bullet": 1 }, + "attack_cost": 50, + "grab_strength": 20, + "special_attacks": [ + { + "type": "leap", + "cooldown": 8, + "move_cost": 0, + "max_range": 12, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } + ], + "upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBTREEFROG_UPGRADE" }, + "extend": { "flags": [ "HARDTOSHOOT", "HIT_AND_RUN" ] }, + "//": "Translation note - 'Croaked' is a euphimistic way of saying 'died' in American English, while 'croak' is an onomatopoeic word for the sound frogs make. A simple, literal translation of 'zombie treefrog' would also be fitting." + }, + { + "id": "mon_frog_shadow", + "type": "MONSTER", + "name": { "str": "shadow leaper" }, + "description": "A lithe and leggy form rests flat against the ground, wreathed in darkness. When it leaps, the shadows follow with it.", + "copy-from": "mon_proxy_frog_zombie", + "volume": "80 L", + "weight": "100 kg", + "hp": 120, + "speed": 110, + "symbol": "K", + "color": "dark_gray_green", + "melee_skill": 5, + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "cut", "amount": 5 } ], + "dodge": 6, + "armor": { "bash": 4, "cut": 1, "bullet": 1 }, + "vision_day": 7, + "vision_night": 40, + "attack_cost": 50, + "grab_strength": 35, + "special_attacks": [ + { + "type": "leap", + "cooldown": 8, + "move_cost": 0, + "max_range": 12, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } + ], + "extend": { "flags": [ "HARDTOSHOOT", "NIGHT_INVISIBILITY", "HIT_AND_RUN" ] } + }, + { + "id": "mon_toad_wart", + "type": "MONSTER", + "name": { "str": "warted monstrosity", "str_pl": "warted monstrosities" }, + "description": "A festering toad the size of a dune buggy. It struggles to pull its bulk towards you. The warts covering its back appear fit to burst with yellow sludge, and more of the stuff flows freely from both ends of it.", + "copy-from": "mon_proxy_frog_zombie", + "volume": "300 L", + "weight": "280 kg", + "hp": 200, + "speed": 50, + "symbol": "D", + "color": "brown_green", + "melee_dice": 5, + "armor": { "bash": 12, "cut": 2, "bullet": 1, "electric": 4 }, + "grab_strength": 40, + "special_attacks": [ + { + "type": "leap", + "cooldown": 12, + "move_cost": 0, + "max_range": 4, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } + ], + "death_function": { + "message": "The %s's body bursts, expelling a copious amount of sludge.", + "effect": { "id": "death_sludge_mega", "hit_self": true }, + "corpse_type": "NO_CORPSE" + }, + "death_drops": "explode_toad", + "extend": { "flags": [ "POISON", "SLUDGETRAIL", "SLUDGEPROOF" ] }, + "//": "When possible, give a sludge-spray on hit effect." + }, + { + "id": "mon_toad_bone", + "type": "MONSTER", + "name": { "str": "death mask zoad" }, + "description": "The face and head of this enormous once-frog is encased in ossified tissue. Its dead eyes peer out from this death mask of hardened bone, which curves into a jagged beak around its mouth. Even its warts appear to have stiffened into dense osteoderms.", + "copy-from": "mon_proxy_frog_zombie", + "volume": "240 L", + "weight": "340 kg", + "hp": 400, + "symbol": "B", + "melee_skill": 6, + "melee_dice": 5, + "armor": { "bash": 15, "cut": 30, "bullet": 20, "electric": 4 }, + "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie", "prof_wp_skeleton" ], + "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog", "wps_amphibian_bone", "wps_bone_armor" ], + "attack_cost": 75, + "grab_strength": 50, + "special_attacks": [ + { + "type": "leap", + "cooldown": 8, + "move_cost": 0, + "max_range": 6, + "min_consider_range": 2, + "condition": { "not": { "u_has_effect": "maimed_leg" } } + }, + { + "id": "ranged_pull", + "range": 4, + "condition": { "and": [ { "not": { "u_has_flag": "GRAB_FILTER" } }, { "not": { "u_has_effect": "maimed_tongue" } } ] }, + "hit_dmg_u": "%s catches you with its tongue and pulls you in!", + "hit_dmg_npc": "%s catches with its tongue and pulls them in!", + "miss_msg_u": "%s's tongue lashes out at you, but you dodge!", + "miss_msg_npc": "%s's tongue lashes out at , but they dodge!", + "no_dmg_msg_u": "%s catches you with its tongue and pulls you in!", + "no_dmg_msg_npc": "%s catches with its tongue and pulls them in!" + }, + { + "id": "bite_grab", + "cooldown": 5, + "accuracy": 5, + "damage_max_instance": [ + { "damage_type": "cut", "amount": 26, "armor_multiplier": 0.2 }, + { "damage_type": "bash", "amount": 14, "armor_multiplier": 0.2 } + ] + }, + { "id": "grab_drag", "cooldown": 3 }, + { "id": "drag_followup" } + ], + "extend": { "flags": [ "POISON" ] } + }, { "id": "mon_zombie_biter", "type": "MONSTER", diff --git a/data/json/speech.json b/data/json/speech.json index feff41bc1cd70..f618832ef6dde 100644 --- a/data/json/speech.json +++ b/data/json/speech.json @@ -2671,13 +2671,25 @@ }, { "type": "speech", - "speaker": [ "mon_zombie_brute_shocker", "mon_zombie_electric", "mon_zombie_nullfield", "mon_skeleton_electric" ], + "speaker": [ + "mon_zombie_brute_shocker", + "mon_zombie_electric", + "mon_zombie_nullfield", + "mon_skeleton_electric", + "mon_frog_shocker" + ], "sound": "crackling sounds.", "volume": 20 }, { "type": "speech", - "speaker": [ "mon_zombie_brute_shocker", "mon_zombie_electric", "mon_zombie_nullfield", "mon_skeleton_electric" ], + "speaker": [ + "mon_zombie_brute_shocker", + "mon_zombie_electric", + "mon_zombie_nullfield", + "mon_skeleton_electric", + "mon_frog_shocker" + ], "sound": "high-pitched hum.", "volume": 20 }, diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index eb36f3d813914..fb43b8a4d8bdf 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -1589,6 +1589,7 @@ jirts johnnycake jointer jointing +jolter jort jorts jpg @@ -2168,6 +2169,8 @@ orthogonally oryctodromeus oscillated osho +osteoderm +osteoderms osteokinesis oter otes @@ -3418,6 +3421,7 @@ warhammers warmouth warpglass warpstream +warted wastebread watchband waterfowl @@ -3549,11 +3553,15 @@ zentai zeriatric zincite zischt +zoad +zoads zolpidem zombaby zombear zombeaver zombeavers +zombfrog +zombfrogs zombiespawn zombiethustra zombification