thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also tumble on guarding whip

Browse source
This commit is contained in:
AJ Martinez 2024-01-06 05:00:09 -07:00
parent 670b3995f1
commit bc4859cf75
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_collide.cpp
View file

@ -858,7 +858,9 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
angle_t thrangle = R_PointToAngle2(victim->x, victim->y, shield->x, shield->y); angle_t thrangle = R_PointToAngle2(victim->x, victim->y, shield->x, shield->y);
attacker->momx = attacker->momy = 0; attacker->momx = attacker->momy = 0;
P_Thrust(attacker, thrangle, FRACUNIT*7); P_Thrust(attacker, thrangle, mapobjectscale*7);
P_DamageMobj(attacker, victim, victim, 1, DMG_TUMBLE);
// A little extra juice, so successful reads are usually positive or zero on spheres. // A little extra juice, so successful reads are usually positive or zero on spheres.
victimPlayer->spheres = std::min(victimPlayer->spheres + 10, 40); victimPlayer->spheres = std::min(victimPlayer->spheres + 10, 40);
@ -875,14 +877,14 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
attackerPlayer->flashing = 0; attackerPlayer->flashing = 0;
// Localized broly for a local event. // Localized broly for a local event.
if (mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag)) if (mobj_t *broly = Obj_SpawnBrolyKi(victim, victimHitlag/2))
{ {
broly->extravalue2 = 16*mapobjectscale; broly->extravalue2 = 16*mapobjectscale;
} }
P_PlayVictorySound(victim); P_PlayVictorySound(victim);
P_DamageMobj(attacker, victim, victim, 1, DMG_STING); P_DamageMobj(attacker, victim, victim, 1, DMG_TUMBLE);
S_StartSound(victim, sfx_mbv92); S_StartSound(victim, sfx_mbv92);
K_AddHitLag(attacker, victimHitlag, true); K_AddHitLag(attacker, victimHitlag, true);
@ -890,9 +892,6 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
K_DoPowerClash(shield, victim); // REJECTED K_DoPowerClash(shield, victim); // REJECTED
attacker->hitlag = victimHitlag; // No, seriously, we do not care about K_AddHitLag's idea of a normal maximum
shield->hitlag = attacker->hitlag;
shield->extravalue2 = 1; shield->extravalue2 = 1;
return true; return true;