From fd56b67b1b7e98acc88a50bd5a56c314ad48928c Mon Sep 17 00:00:00 2001 From: SteelT Date: Thu, 29 Jun 2023 13:58:00 -0400 Subject: [PATCH] Battle UFO instawhip damage --- src/k_collide.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index cc3dd492d..ad780a044 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -920,11 +920,12 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim) || victim->type == MT_BANANA || victim->type == MT_EGGMANITEM || victim->type == MT_BALLHOG || victim->type == MT_SSMINE || victim->type == MT_LANDMINE || victim->type == MT_SINK || victim->type == MT_GARDENTOP || victim->type == MT_DROPTARGET || victim->type == MT_BATTLECAPSULE - || victim->type == MT_MONITOR || victim->type == MT_SPECIAL_UFO) + || victim->type == MT_MONITOR || victim->type == MT_SPECIAL_UFO || victim->type == MT_BATTLEUFO) { // Monitor hack. We can hit monitors once per instawhip, no multihit shredding! // Damage values in Obj_MonitorGetDamage. - if (victim->type == MT_MONITOR) + // Apply to UFO also -- steelt 29062023 + if (victim->type == MT_MONITOR || victim->type == MT_BATTLEUFO) { if (shield->extravalue1 == 1) return false;