From 9d6c643f6c3548c44ff6a58d45671b0596b3ad83 Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Tue, 8 Oct 2024 21:38:06 -0400 Subject: [PATCH] Remove DMG_WUMBO comboing and fix respawn lua value --- src/deh_tables.c | 3 --- src/info.c | 27 --------------------------- src/info.h | 2 -- src/k_collide.c | 20 ++++++++++---------- src/lua_playerlib.c | 2 -- src/p_inter.c | 20 ++------------------ src/p_local.h | 2 +- src/p_map.c | 2 +- src/p_user.c | 2 +- 9 files changed, 15 insertions(+), 65 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index c9c879592..030d56328 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -5439,8 +5439,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_PAPERITEMSPOT", - "MT_BEAMPOINT", - "MT_LOOPENDPOINT", "MT_LOOPCENTERPOINT", }; @@ -6298,7 +6296,6 @@ struct int_const_s const INT_CONST[] = { //// Masks {"DMG_STEAL",DMG_STEAL}, {"DMG_CANTHURTSELF",DMG_CANTHURTSELF}, - {"DMG_WOMBO", DMG_WOMBO}, {"DMG_DEATHMASK",DMG_DEATHMASK}, {"DMG_TYPEMASK",DMG_TYPEMASK}, diff --git a/src/info.c b/src/info.c index bc73e1232..6a62492dc 100644 --- a/src/info.c +++ b/src/info.c @@ -27912,33 +27912,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_BEAMPOINT - 2424, // doomednum - S_INVISIBLE, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 48*FRACUNIT, // radius - 32*FRACUNIT, // height - 0, // display offset - 100, // mass - 1, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIPTHING|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - { // MT_LOOPENDPOINT 2020, // doomednum S_INVISIBLE, // spawnstate diff --git a/src/info.h b/src/info.h index 079f5427e..cda76d62b 100644 --- a/src/info.h +++ b/src/info.h @@ -6449,8 +6449,6 @@ typedef enum mobj_type MT_PAPERITEMSPOT, - MT_BEAMPOINT, - MT_LOOPENDPOINT, MT_LOOPCENTERPOINT, diff --git a/src/k_collide.c b/src/k_collide.c index 908a956da..252121111 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -67,7 +67,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2) else { // Player Damage - P_DamageMobj(t2, t1, t1->target, 1, DMG_WIPEOUT|DMG_WOMBO); + P_DamageMobj(t2, t1, t1->target, 1, DMG_WIPEOUT); K_KartBouncing(t2, t1); S_StartSound(t2, sfx_s3k7b); } @@ -160,7 +160,7 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2) } else { - P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL|DMG_WOMBO); + P_DamageMobj(t2, t1, t1->target, 1, DMG_NORMAL); } damageitem = true; @@ -688,7 +688,7 @@ static inline BlockItReturn_t PIT_LightningShieldAttack(mobj_t *thing) } #endif - P_DamageMobj(thing, lightningSource, lightningSource, 1, DMG_NORMAL|DMG_CANTHURTSELF|DMG_WOMBO); + P_DamageMobj(thing, lightningSource, lightningSource, 1, DMG_NORMAL|DMG_CANTHURTSELF); return BMIT_CONTINUE; } @@ -731,7 +731,7 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) return true; // Player Damage - P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL|DMG_WOMBO); + P_DamageMobj(t2, ((t1->type == MT_BUBBLESHIELD) ? t1->target : t1), t1, 1, DMG_NORMAL); S_StartSound(t1, sfx_s3k44); } else @@ -880,12 +880,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) if (t1Condition == true && t2Condition == false) { - P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT|DMG_WOMBO); + P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT); return true; } else if (t1Condition == false && t2Condition == true) { - P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_WOMBO); + P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT); return true; } @@ -902,12 +902,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) if (t1Condition == true && t2Condition == false) { - P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT|DMG_STEAL|DMG_WOMBO); + P_DamageMobj(t2, t1, t1, 1, DMG_WIPEOUT|DMG_STEAL); return true; } else if (t1Condition == false && t2Condition == true) { - P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_STEAL|DMG_WOMBO); + P_DamageMobj(t1, t2, t2, 1, DMG_WIPEOUT|DMG_STEAL); return true; } } @@ -921,7 +921,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) { if (t2->player->rings <= 0) { - P_DamageMobj(t2, t1, t1, 1, DMG_STING|DMG_WOMBO); + P_DamageMobj(t2, t1, t1, 1, DMG_STING); stungT2 = true; } @@ -932,7 +932,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) { if (t1->player->rings <= 0) { - P_DamageMobj(t1, t2, t2, 1, DMG_STING|DMG_WOMBO); + P_DamageMobj(t1, t2, t2, 1, DMG_STING); stungT1 = true; } diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 741ca334c..59ace7435 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -528,8 +528,6 @@ static int player_set(lua_State *L) return NOSET; else if (fastcmp(field,"oldcmd")) return NOSET; - else if (fastcmp(field,"respawn")) - return NOSET; else if (fastcmp(field,"playerstate")) plr->playerstate = luaL_checkinteger(L, 3); else if (fastcmp(field,"viewz")) diff --git a/src/p_inter.c b/src/p_inter.c index 5e8450c7c..8a4698465 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2020,26 +2020,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da { - if (((type == DMG_NORMAL) || (type == DMG_WIPEOUT)) || (type == DMG_STING) || (type == DMG_WOMBO)) // No combos pls thx - { - if (player->spinouttimer > 0) - { - K_DoInstashield(player); - //CONS_Printf("is this shit even working....\n"); - return false; - } - } - - if (player->squishedtimer > 0) - { - K_DoInstashield(player); - return false; - } - // Check if we should allow wombo combos (hard hits by default, inverted by the presence of DMG_WOMBO). - boolean allowcombo = (hardhit == !(damagetype & DMG_WOMBO)); + boolean allowcombo = hardhit; - if ((allowcombo == false) && player->flashing > 0) + if ((allowcombo == false) && (player->flashing > 0 || player->squishedtimer > 0)) { // Post-hit invincibility K_DoInstashield(player); diff --git a/src/p_local.h b/src/p_local.h index 2ee99bd6b..52677632e 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -534,7 +534,7 @@ typedef struct BasicFF_s #define DMG_SPECTATOR 0x83 #define DMG_TIMEOVER 0x84 // Masks -#define DMG_WOMBO 0x10 // Flag - setting this flag allows objects to damage you if you're already in spinout. The effect is reversed on objects with MF_MISSILE (setting it prevents them from comboing in spinout) +//free 0x10 // Flag - setting this flag allows objects to damage you if you're already in spinout. The effect is reversed on objects with MF_MISSILE (setting it prevents them from comboing in spinout) #define DMG_STEAL 0x20 // Flag - can steal bumpers, will only deal damage to players, and will not deal damage outside Battle Mode. #define DMG_CANTHURTSELF 0x40 // Flag - cannot hurt your self or your team #define DMG_DEATHMASK DMG_INSTAKILL // if bit 7 is set, this is a death type instead of a damage type diff --git a/src/p_map.c b/src/p_map.c index 0da4a0d50..c9e454244 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -894,7 +894,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) // missiles can hit other things if (tm.thing->flags & MF_MISSILE) { - UINT8 damagetype = (tm.thing->info->mass ^ DMG_WOMBO); + UINT8 damagetype = tm.thing->info->mass; // see if it went over / under if (tm.thing->z > thing->z + thing->height) diff --git a/src/p_user.c b/src/p_user.c index a4d4df655..feb6d0d62 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2525,7 +2525,7 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius) if (mo->flags & MF_BOSS) //don't OHKO bosses nor players! P_DamageMobj(mo, inflictor, source, 1, DMG_NORMAL|DMG_CANTHURTSELF); else if (mo->type == MT_PLAYER) // Lightning shield: Combo players. - P_DamageMobj(mo, inflictor, source, 1, DMG_NORMAL|DMG_CANTHURTSELF|DMG_WOMBO); + P_DamageMobj(mo, inflictor, source, 1, DMG_NORMAL|DMG_CANTHURTSELF); else P_DamageMobj(mo, inflictor, source, 1000, DMG_NORMAL|DMG_CANTHURTSELF); }