diff --git a/src/info/mobjs.h b/src/info/mobjs.h index 207456333..448199356 100644 --- a/src/info/mobjs.h +++ b/src/info/mobjs.h @@ -605,8 +605,8 @@ _(BOOMPARTICLE) // Land Mine _(LANDMINE) // Egg Mine -_(EGGMINE_CAPSULE) -_(EGGMINE_SHIELD) +// _(EGGMINE_CAPSULE) +// _(EGGMINE_SHIELD) _(BALLHOG) // Ballhog _(BALLHOGBOOM) diff --git a/src/info/states.h b/src/info/states.h index 86c8c67f4..21102a637 100644 --- a/src/info/states.h +++ b/src/info/states.h @@ -2817,9 +2817,9 @@ _(LANDMINE) _(LANDMINE_EXPLODE) // Egg mine -_(EGGMINE) -_(EGGMINE_POP) -_(EGGMINE_SHIELD) +// _(EGGMINE) +// _(EGGMINE_POP) +// _(EGGMINE_SHIELD) // Ballhog _(BALLHOG1) diff --git a/src/k_collide.c b/src/k_collide.c index cb49ec324..bc92a4ce8 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -576,8 +576,8 @@ static void K_BubbleShieldCollideDrain(player_t *player, mobj_t *bubble, INT16 d static boolean K_BubbleReflectingTrapItem(const mobj_t *t) { return t->type == MT_BANANA || (t->type == MT_ORBINAUT && t->flags2 & MF2_AMBUSH) || t->type == MT_JAWZ_DUD || - t->type == MT_EGGMANITEM || t->type == MT_SSMINE || t->type == MT_SSMINE_SHIELD || t->type == MT_LANDMINE || - t->type == MT_EGGMINE_CAPSULE || t->type == MT_EGGMINE_SHIELD; + t->type == MT_EGGMANITEM || t->type == MT_SSMINE || t->type == MT_SSMINE_SHIELD || t->type == MT_LANDMINE;// || + // t->type == MT_EGGMINE_CAPSULE || t->type == MT_EGGMINE_SHIELD; } static boolean K_StrongPlayerBump(const player_t *player) @@ -640,7 +640,7 @@ boolean K_BubbleShieldCanReflect(mobj_t *t) { return (t->type == MT_ORBINAUT || t->type == MT_JAWZ || t->type == MT_JAWZ_DUD || t->type == MT_BANANA || t->type == MT_EGGMANITEM || t->type == MT_BALLHOG - || t->type == MT_SSMINE || t->type == MT_LANDMINE || t->type == MT_EGGMINE_CAPSULE || t->type == MT_SINK + || t->type == MT_SSMINE || t->type == MT_LANDMINE || t->type == MT_SINK //|| t->type == MT_EGGMINE_CAPSULE || t->type == MT_KART_LEFTOVER || t->type == MT_PLAYER); } @@ -660,7 +660,7 @@ static INT16 K_GetBubbleDamage(mobj_t* itm) { case MT_EGGMANITEM: case MT_BALLHOG: - case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_CAPSULE: // Experiment: Let Bubble Shields hard-counter Ballhogs and Eggboxes. dmg = 0; break; diff --git a/src/p_mobj.c b/src/p_mobj.c index 33ca9ddae..ef57fb276 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1229,7 +1229,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo) case MT_EGGMANITEM: case MT_SSMINE: case MT_LANDMINE: - case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_CAPSULE: case MT_SINK: if (mo->extravalue2 > 0) { @@ -6486,7 +6486,7 @@ boolean P_IsKartFieldItem(INT32 type) case MT_JAWZ_DUD: case MT_SSMINE: case MT_LANDMINE: - case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_CAPSULE: case MT_BALLHOG: case MT_BUBBLESHIELDTRAP: case MT_SINK: @@ -7983,7 +7983,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj) case MT_BANANA: case MT_EGGMANITEM: case MT_LANDMINE: - case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_CAPSULE: case MT_SPB: if (P_IsObjectOnGround(mobj)) { @@ -8767,7 +8767,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) if (mobj->threshold > 0) mobj->threshold--; break; - case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_CAPSULE: // todo // decrement fuse while on ground // when fuse runs out pop open and spawn a land mine @@ -10853,8 +10853,8 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_SSMINE: case MT_SSMINE_SHIELD: case MT_LANDMINE: - case MT_EGGMINE_CAPSULE: - case MT_EGGMINE_SHIELD: + // case MT_EGGMINE_CAPSULE: + // case MT_EGGMINE_SHIELD: case MT_BALLHOG: case MT_SINK: case MT_ROCKETSNEAKER: