diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index 0c98cbdaba9d2..cc6c9c6d59119 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -407,5 +407,42 @@ "miss_msg_u": "%s goes for your legs! You duck!", "miss_msg_npc": "%s goes 's legs, but they duck!", "effects": [ { "id": "downed", "duration": 3 } ] + }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "bio_op_takedown", + "cooldown": 10, + "move_cost": 100, + "attack_chance": 50, + "hitsize_min": 4, + "attack_upper": false, + "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ], + "effects_require_dmg": false, + "hit_dmg_u": "%1$s kicks your %2$s and slams you to the ground!", + "hit_dmg_npc": "%1$s kicks and slams them to the ground!", + "no_dmg_msg_u": "%1$s tries to kick %2$s and knock you down, but your armor protects you!", + "no_dmg_msg_npc": "%1$s tries to kick and knock down, but their armor protects them!", + "miss_msg_u": "%s tries to kick your %2$s but you dodge!", + "miss_msg_npc": "%s tries to kick and knock down , but they dodge!", + "effects": [ { "id": "downed", "duration": 3 }, { "id": "stunned", "duration": 100 } ] + }, + { + "type": "monster_attack", + "attack_type": "melee", + "id": "bio_op_impale", + "cooldown": 25, + "move_cost": 150, + "damage_max_instance": [ { "damage_type": "stab", "amount": 36, "armor_penetration": 8, "armor_multiplier": 0.5 } ], + "hitsize_min": 4, + "effects": [ { "id": "bleed", "duration": 100, "affect_hit_bp": true } ], + "hit_dmg_u": "%1$s lunges and impales your %2$s!", + "hit_dmg_npc": "%1$s lunges and impales !", + "miss_msg_u": "%1$s lunges and tries to impale your %2$s, but you dodge!", + "miss_msg_npc": "%1$s lunges and tries to impale , but they dodge!", + "no_dmg_msg_u": "%1$s lunges and tries to impale your %2$s, but fails to penetrate your armor!", + "no_dmg_msg_npc": "%1$s tries to impale , but fails to penetrate their armor!", + "dodgeable": true, + "blockable": true } ] diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 44823b1a8ba81..5a1b071e5fc14 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -393,7 +393,7 @@ "harvest": "zombie", "special_attacks": [ { "id": "smash", "throw_strength": 72, "cooldown": 30 }, - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index d589ade084f15..7ae571c6ba667 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -544,7 +544,7 @@ "vision_night": 3, "luminance": 4, "harvest": "zombie", - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "special_when_hit": [ "ZAPBACK", 75 ], "death_drops": "mon_zombie_bio_op_death_drops", "fungalize_into": "mon_zombie_fungus", diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index c0b47a7713ed8..c991b729ba909 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -256,7 +256,12 @@ "speed": 75, "hp": 300, "zombify_into": "mon_ziats", - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ], { "id": "teeth_rip", "cooldown": 10 } ], + "special_attacks": [ + { "id": "bio_op_takedown", "cooldown": 20 }, + [ "RANGED_PULL", 20 ], + [ "GRAB_DRAG", 10 ], + { "id": "teeth_rip", "cooldown": 10 } + ], "description": "Huge predatory bipedal dinosaur with long claws and strong arms for grappling.", "reproduction": { "baby_egg": "egg_siats", "baby_count": 3, "baby_timer": 24 }, "harvest": "dino_large_pred" @@ -397,7 +402,7 @@ { "id": "teeth_puncture", "cooldown": 7 }, { "id": "teeth_pull", "cooldown": 5 }, [ "LUNGE", 10 ], - [ "BIO_OP_TAKEDOWN", 30 ] + { "id": "bio_op_takedown", "cooldown": 30 } ], "flags": [ "SEES", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "DESTROYS", "WARM", "PUSH_MON" ], "harvest": "dino_large_feather_pred", @@ -423,7 +428,7 @@ { "id": "teeth_puncture", "cooldown": 20 }, { "id": "teeth_pull", "cooldown": 10 }, [ "LUNGE", 10 ], - [ "BIO_OP_TAKEDOWN", 20 ] + { "id": "bio_op_takedown", "cooldown": 20 } ] }, { @@ -444,7 +449,7 @@ { "id": "teeth_puncture", "cooldown": 10 }, { "id": "teeth_pull", "cooldown": 10 }, [ "LUNGE", 10 ], - [ "BIO_OP_TAKEDOWN", 15 ] + { "id": "bio_op_takedown", "cooldown": 15 } ], "harvest": "dino_large_feather_pred" }, @@ -486,7 +491,7 @@ { "id": "teeth_puncture", "cooldown": 7 }, { "id": "teeth_pull", "cooldown": 5 }, [ "LUNGE", 10 ], - [ "BIO_OP_TAKEDOWN", 15 ] + { "id": "bio_op_takedown", "cooldown": 15 } ], "flags": [ "SEES", diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json index eafb2160eb722..176865c9d2b68 100644 --- a/data/mods/DinoMod/monsters/dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/dinosaur_CBM.json @@ -27,7 +27,7 @@ "luminance": 1, "starting_ammo": { "battery": 10 }, "special_attacks": [ - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, { "type": "gun", "cooldown": 7, @@ -76,7 +76,7 @@ [ "GRAB", 7 ], { "type": "bite", "cooldown": 5 }, [ "LUNGE", 10 ], - [ "BIO_OP_TAKEDOWN", 15 ], + { "id": "bio_op_takedown", "cooldown": 15 }, { "type": "spell", "spell_data": { "id": "CBM_TRex_recording" }, "cooldown": 1600 } ], "zombify_into": "mon_zyrannosaurus_bio_op", @@ -105,7 +105,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A small fast-moving bipedal dinosaur dotted with crackling bionics. Its sharp claws and teeth glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -131,7 +131,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "zombify_into": "mon_zallimimus_bio_op", "description": "A fast-moving feathered bipedal dinosaur dotted with crackling bionics. Its curved claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], @@ -158,7 +158,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "zombify_into": "mon_zallimimus_bio_op", "description": "A fast-moving feathered bipedal dinosaur dotted with crackling bionics and a long tail.", "special_when_hit": [ "ZAPBACK", 75 ], @@ -185,7 +185,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. Its small, hooked claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_raptor" @@ -211,7 +214,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. Its small, hooked claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_raptor" @@ -237,7 +243,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "zombify_into": "mon_zeinonychus_bio_op", "description": "A bipedal dinosaur covered with feathers and crackling bionics. Each foot has a large glowing sickle-like claw.", "special_when_hit": [ "ZAPBACK", 75 ], @@ -264,7 +273,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. Its small, hooked claws and many sharp teeth glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_raptor" @@ -290,7 +302,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. Each foot has a large glowing sickle-like claw.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_raptor" @@ -316,7 +331,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A small bipedal dinosaur dotted with crackling bionics with long arms. The sharp teeth glow menacingly", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -343,7 +358,7 @@ "vision_day": 100, "luminance": 4, "special_attacks": [ - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }, [ "tailsmash_DinoMod", 30 ], [ "EAT_CROP", 5 ] @@ -374,7 +389,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A long-necked bipedal dinosaur dotted with crackling bionics with long legs and short arms. Its hooked beak glows menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -400,7 +415,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics and sporting a round hard-looking domed head. Its curved claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -426,7 +441,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "zombify_into": "mon_zachycephalosaurus_bio_op", "description": "A feathered bipedal dinosaur dotted with crackling bionics and sporting a round hard-looking domed head. Its curved claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], @@ -453,7 +468,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "zombify_into": "mon_zachycephalosaurus_bio_op", "description": "A small four legged dinosaur dotted with crackling bionics with a glowing beak and small horns", "special_when_hit": [ "ZAPBACK", 75 ], @@ -480,7 +495,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "zombify_into": "mon_zriceratops_bio_op", "description": "A massive three-horned four-legged dinosaur dotted with crackling bionics. The horns glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], @@ -507,7 +522,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. The tiny claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -533,7 +548,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A small feathered bipedal dinosaur dotted with crackling bionics. The claws glow menacingly.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" @@ -559,7 +574,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 100, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A feathered flying reptile with short wings dotted with crackling bionics and a colorful glowing beak.", "special_when_hit": [ "ZAPBACK", 75 ], "dissect": "dissect_CBM_DINO" diff --git a/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json b/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json index eed8afbe35238..ba056dfa2f4bd 100644 --- a/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json @@ -30,7 +30,7 @@ "luminance": 1, "starting_ammo": { "battery": 10 }, "special_attacks": [ - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, { "type": "gun", "cooldown": 20, @@ -70,7 +70,7 @@ [ "scratch", 10 ], [ "GRAB", 7 ], { "type": "bite", "cooldown": 5 }, - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, { "type": "spell", "spell_data": { "id": "CBM_TRex_recording" }, "cooldown": 1600 } ], "description": "The shuffling corpse of a bipedal dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", @@ -90,7 +90,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 50, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "The shuffling corpse of a bipedal dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", "special_when_hit": [ "ZAPBACK", 75 ], "upgrades": { }, @@ -108,7 +108,10 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 50, "luminance": 4, - "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ + { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, + { "id": "bio_op_takedown", "cooldown": 20 } + ], "description": "A bipedal dinosaur covered with tattered feathers, black goo, and crackling bionics. Each foot has a large glowing sickle-like claw.", "special_when_hit": [ "ZAPBACK", 75 ], "upgrades": { }, @@ -127,7 +130,7 @@ "vision_day": 50, "luminance": 4, "special_attacks": [ - [ "BIO_OP_TAKEDOWN", 20 ], + { "id": "bio_op_takedown", "cooldown": 20 }, { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }, [ "tailsmash_DinoMod", 30 ] ], @@ -148,7 +151,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 50, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "The shuffling corpse of a bipedal dinosaur with a round hard-looking domed head. The body is dotted with crackling bionics, tattered feathers, and black putrid liquid and carries glowing, curved claws.", "special_when_hit": [ "ZAPBACK", 75 ], "upgrades": { }, @@ -166,7 +169,7 @@ "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], "vision_day": 50, "luminance": 4, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], "description": "A massive shambling rhino-like dinosaur corpse dotted with crackling bionics with a bony crest and three wicked looking glowing horns. Its black eyes ooze like tears.", "special_when_hit": [ "ZAPBACK", 75 ], "upgrades": { }, diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json index 152685f5ad8ea..a796ca55df7a9 100644 --- a/data/mods/DinoMod/monsters/zinosaur_upgrade.json +++ b/data/mods/DinoMod/monsters/zinosaur_upgrade.json @@ -1999,7 +1999,7 @@ "speed": 60, "attack_cost": 60, "hp": 365, - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 }, [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "burn_into": "mon_ziats_scorched", "fungalize_into": "mon_ziats_fungus", "categories": [ "DINOSAUR" ] @@ -3134,7 +3134,7 @@ "melee_dice": 3, "melee_dice_sides": 5, "melee_damage": [ { "damage_type": "cut", "amount": 6 } ], - "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 }, [ "RANGED_PULL", 20 ], [ "GRAB_DRAG", 10 ] ], "upgrades": { "half_life": 15, "into": "mon_sallosaurus_brute" } }, {