thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stumble-stumbles' into 'master'

Browse source 
Whumble

Closes #522

See merge request KartKrew/Kart!1342
This commit is contained in:
James R 2023-07-19 21:54:00 +00:00
commit 41df845f05
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/deh_tables.c
View file

@ -6550,6 +6550,7 @@ struct int_const_s const INT_CONST[] = {
{"DMG_KARMA",DMG_KARMA}, {"DMG_KARMA",DMG_KARMA},
{"DMG_VOLTAGE",DMG_VOLTAGE}, {"DMG_VOLTAGE",DMG_VOLTAGE},
{"DMG_STUMBLE",DMG_STUMBLE}, {"DMG_STUMBLE",DMG_STUMBLE},
{"DMG_WHUMBLE",DMG_WHUMBLE},
//// Death types //// Death types
{"DMG_INSTAKILL",DMG_INSTAKILL}, {"DMG_INSTAKILL",DMG_INSTAKILL},
{"DMG_DEATHPIT",DMG_DEATHPIT}, {"DMG_DEATHPIT",DMG_DEATHPIT},

2
src/k_collide.cpp
View file

@ -888,7 +888,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
// while still behaving as if it's a "real" hit. // while still behaving as if it's a "real" hit.
P_PlayRinglossSound(victim); P_PlayRinglossSound(victim);
P_PlayerRingBurst(victimPlayer, 5); P_PlayerRingBurst(victimPlayer, 5);
P_DamageMobj(victim, shield, attacker, 1, DMG_STUMBLE); // There's a special exception in P_DamageMobj for type==MT_INSTAWHIP P_DamageMobj(victim, shield, attacker, 1, DMG_WHUMBLE);
K_DropPowerUps(victimPlayer); K_DropPowerUps(victimPlayer);

21
src/p_inter.c
View file

@ -2326,7 +2326,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
invincible = false; invincible = false;
} }
if (invincible && type != DMG_STUMBLE) if (invincible && type != DMG_STUMBLE && type != DMG_WHUMBLE)
{ {
const INT32 oldHitlag = target->hitlag; const INT32 oldHitlag = target->hitlag;
const INT32 oldHitlagInflictor = inflictor ? inflictor->hitlag : 0; const INT32 oldHitlagInflictor = inflictor ? inflictor->hitlag : 0;
@ -2384,7 +2384,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
{ {
// Check if we should allow wombo combos (hard hits by default, inverted by the presence of DMG_WOMBO). // Check if we should allow wombo combos (hard hits by default, inverted by the presence of DMG_WOMBO).
boolean allowcombo = ((hardhit || (type == DMG_STUMBLE)) == !(damagetype & DMG_WOMBO)); boolean allowcombo = ((hardhit || (type == DMG_STUMBLE || type == DMG_WHUMBLE)) == !(damagetype & DMG_WOMBO));
// Tumble/stumble is a special case. // Tumble/stumble is a special case.
if (type == DMG_TUMBLE) if (type == DMG_TUMBLE)
@ -2393,11 +2393,16 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (player->tumbleBounces == 1 && (P_MobjFlip(target)*target->momz > 0)) if (player->tumbleBounces == 1 && (P_MobjFlip(target)*target->momz > 0))
allowcombo = false; allowcombo = false;
} }
else if (type == DMG_STUMBLE) else if (type == DMG_STUMBLE || type == DMG_WHUMBLE)
{ {
// don't allow constant combo // don't allow constant combo
if (player->tumbleBounces == TUMBLEBOUNCES-1 && (P_MobjFlip(target)*target->momz > 0)) if (player->tumbleBounces == TUMBLEBOUNCES-1 && (P_MobjFlip(target)*target->momz > 0))
{
if (type == DMG_STUMBLE)
return false; // No-sell strings of stumble
allowcombo = false; allowcombo = false;
}
} }
if (allowcombo == false && (target->eflags & MFE_PAUSED)) if (allowcombo == false && (target->eflags & MFE_PAUSED))
@ -2406,7 +2411,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
// DMG_EXPLODE excluded from flashtic checks to prevent dodging eggbox/SPB with weak spinout // DMG_EXPLODE excluded from flashtic checks to prevent dodging eggbox/SPB with weak spinout
if ((target->hitlag == 0 || allowcombo == false) && player->flashing > 0 && type != DMG_EXPLODE && type != DMG_STUMBLE) if ((target->hitlag == 0 || allowcombo == false) && player->flashing > 0 && type != DMG_EXPLODE && type != DMG_STUMBLE && type != DMG_WHUMBLE)
{ {
// Post-hit invincibility // Post-hit invincibility
K_DoInstashield(player); K_DoInstashield(player);
@ -2434,9 +2439,8 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
damage = 0; damage = 0;
} }
// Instawhip breaks the rules and does "damaging stumble", // Sting and stumble shouldn't be rewarding Battle hits.
// but sting and stumble shouldn't be rewarding Battle hits otherwise. if (type == DMG_STING || type == DMG_STUMBLE)
if ((type == DMG_STING || type == DMG_STUMBLE) && !(inflictor && inflictor->type == MT_INSTAWHIP))
{ {
damage = 0; damage = 0;
} }
@ -2532,6 +2536,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
ringburst = 0; ringburst = 0;
break; break;
case DMG_STUMBLE: case DMG_STUMBLE:
case DMG_WHUMBLE:
K_StumblePlayer(player); K_StumblePlayer(player);
ringburst = 0; ringburst = 0;
break; break;
@ -2554,7 +2559,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
break; break;
} }
if (type != DMG_STUMBLE) if (type != DMG_STUMBLE && type != DMG_WHUMBLE)
{ {
if (type != DMG_STING) if (type != DMG_STING)
player->flashing = K_GetKartFlashing(player); player->flashing = K_GetKartFlashing(player);

1
src/p_local.h
View file

@ -544,6 +544,7 @@ struct BasicFF_t
#define DMG_KARMA 0x05 // Karma Bomb explosion -- works like DMG_EXPLODE, but steals half of their bumpers & deletes the rest #define DMG_KARMA 0x05 // Karma Bomb explosion -- works like DMG_EXPLODE, but steals half of their bumpers & deletes the rest
#define DMG_VOLTAGE 0x06 #define DMG_VOLTAGE 0x06
#define DMG_STUMBLE 0x07 #define DMG_STUMBLE 0x07
#define DMG_WHUMBLE 0x08
//// Death types - cannot be combined with damage types //// Death types - cannot be combined with damage types
#define DMG_INSTAKILL 0x80 #define DMG_INSTAKILL 0x80
#define DMG_DEATHPIT 0x81 #define DMG_DEATHPIT 0x81