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

Merge branch 'power-scam' into 'master'

Browse source 
Power item scam removal mk.2

See merge request KartKrew/Kart!2413
This commit is contained in:
Oni 2024-08-06 01:46:22 +00:00
commit 2de63e432f
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/k_kart.c
View file

@ -440,6 +440,14 @@ boolean K_IsPlayerLosing(player_t *player)
return (player->position > winningpos); return (player->position > winningpos);
} }
// Some behavior should change if the player approaches the frontrunner unusually fast.
boolean K_IsPlayerScamming(player_t *player)
{
// "Why 8?" Consistency
// "Why 2000?" Vibes
return (K_GetItemRouletteDistance(player, 8) < 2000);
}
fixed_t K_GetKartGameSpeedScalar(SINT8 value) fixed_t K_GetKartGameSpeedScalar(SINT8 value)
{ {
// Easy = 81.25% // Easy = 81.25%
@ -9024,7 +9032,12 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
} }
if (player->invincibilitytimer && (player->ignoreAirtimeLeniency > 0 || onground == true || K_PowerUpRemaining(player, POWERUP_SMONITOR))) if (player->invincibilitytimer && (player->ignoreAirtimeLeniency > 0 || onground == true || K_PowerUpRemaining(player, POWERUP_SMONITOR)))
{
player->invincibilitytimer--; player->invincibilitytimer--;
if (player->invincibilitytimer && K_IsPlayerScamming(player))
player->invincibilitytimer--;
}
if (!player->invincibilitytimer) if (!player->invincibilitytimer)
player->invincibilityextensions = 0; player->invincibilityextensions = 0;
@ -9060,7 +9073,12 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if ((player->respawn.state == RESPAWNST_NONE) && player->growshrinktimer != 0) if ((player->respawn.state == RESPAWNST_NONE) && player->growshrinktimer != 0)
{ {
if (player->growshrinktimer > 0 && (onground == true || player->ignoreAirtimeLeniency > 0)) if (player->growshrinktimer > 0 && (onground == true || player->ignoreAirtimeLeniency > 0))
{
player->growshrinktimer--; player->growshrinktimer--;
if (player->growshrinktimer && K_IsPlayerScamming(player))
player->growshrinktimer--;
}
if (player->growshrinktimer < 0) if (player->growshrinktimer < 0)
player->growshrinktimer++; player->growshrinktimer++;
@ -9378,7 +9396,8 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (P_PlayerInPain(player) || player->respawn.state != RESPAWNST_NONE) if (P_PlayerInPain(player) || player->respawn.state != RESPAWNST_NONE)
{ {
player->lastpickuptype = -1; // got your ass beat, go grab anything // Too abusable! Revisit this with nerfed boxes or something.
// player->lastpickuptype = -1; // got your ass beat, go grab anything
player->defenseLockout = 0; // and reenable defensive tools just in case player->defenseLockout = 0; // and reenable defensive tools just in case
} }
@ -11384,7 +11403,8 @@ void K_KartUpdatePosition(player_t *player)
} }
else else
{ {
player->topinfirst = 0; if (player->topinfirst && (leveltime%3 == 0))
player->topinfirst--;
} }
} }
} }
@ -11845,7 +11865,7 @@ static void K_KartSpindash(player_t *player)
UINT16 buttons = K_GetKartButtons(player); UINT16 buttons = K_GetKartButtons(player);
boolean spawnWind = (leveltime % 2 == 0); boolean spawnWind = (leveltime % 2 == 0);
if (player->mo->hitlag > 0 || P_PlayerInPain(player)) if (player->mo->hitlag > 0 || P_PlayerInPain(player) || player->curshield == KSHIELD_TOP)
{ {
player->spindash = 0; player->spindash = 0;
} }
@ -11961,7 +11981,7 @@ static void K_KartSpindash(player_t *player)
S_ReducedVFXSound(player->mo, sfx_ruburn, player); S_ReducedVFXSound(player->mo, sfx_ruburn, player);
} }
if (player->speed < 6*player->mo->scale) if (player->speed < 6*player->mo->scale && player->curshield != KSHIELD_TOP)
{ {
if ((buttons & (BT_DRIFT|BT_BRAKE)) == (BT_DRIFT|BT_BRAKE)) if ((buttons & (BT_DRIFT|BT_BRAKE)) == (BT_DRIFT|BT_BRAKE))
{ {
@ -13254,6 +13274,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
P_InstaThrust(player->mo, angle, player->speed + (80 * mapobjectscale)); P_InstaThrust(player->mo, angle, player->speed + (80 * mapobjectscale));
P_SetObjectMomZ(player->mo, player->mo->info->height / 8, true); P_SetObjectMomZ(player->mo, player->mo->info->height / 8, true);
// Limit top spaceflight, whether accidental or on purpose, by forcing a fastfall
player->cmd.buttons |= BT_EBRAKEMASK;
player->pflags &= ~PF_NOFASTFALL;
if (top != NULL) if (top != NULL)
{ {
top->momx = player->mo->momx; top->momx = player->mo->momx;

1
src/k_kart.h
View file

@ -94,6 +94,7 @@ UINT32 K_GetPlayerDontDrawFlag(player_t *player);
void K_ReduceVFXForEveryone(mobj_t *mo); void K_ReduceVFXForEveryone(mobj_t *mo);
boolean K_IsPlayerLosing(player_t *player); boolean K_IsPlayerLosing(player_t *player);
boolean K_IsPlayerScamming(player_t *player);
fixed_t K_GetKartGameSpeedScalar(SINT8 value); fixed_t K_GetKartGameSpeedScalar(SINT8 value);
INT32 K_GetShieldFromItem(INT32 item); INT32 K_GetShieldFromItem(INT32 item);