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

Hog refinement, PF2_FASTTUMBLEBOUNCE

Browse source
This commit is contained in:
Antonio Martinez 2025-07-29 17:26:15 -04:00
parent 6aed8f5f1c
commit 893098c59d
4 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -145,6 +145,7 @@ typedef enum
PF2_ALWAYSDAMAGED = 1<<6, // Ignore invulnerability or clash conditions when evaulating damage (P_DamageMobj). Unset after use!
PF2_BUBBLECONTACT = 1<<7, // ACHTUNG VERY BAD HACK - Don't allow Bubble Shield to contact certain objects unless this is a fresh blowup.
PF2_SUPERTRANSFERVFX = 1<<8, // Don't respawn the "super transfer available" VFX.
PF2_FASTTUMBLEBOUNCE = 1<<9, // Don't lose speed when tumblebouncing.
} pflags2_t;
typedef enum

15
src/k_hud_track.cpp
View file

@ -468,7 +468,20 @@ std::optional<TargetTracking::Tooltip> object_tooltip(const mobj_t* mobj)
TextElement().parse("<c_animated>").font(splitfont))
)
.offset3d(0, 0, 64 * mobj->scale * P_MobjFlip(mobj));
if (mobj->player == stplyr && stplyr->ballhogburst >= (BALLHOG_BURST_FUSE/3))
{
UINT32 flag = 0;
if (stplyr->ballhogburst % 2)
flag = (stplyr->ballhogburst >= (2*BALLHOG_BURST_FUSE/3)) ? V_REDMAP : V_YELLOWMAP;
return Tooltip(
TextElement(
TextElement().parse("DANGER!").flags(V_20TRANS|flag).font(splitfont))
)
.offset3d(0, 0, 32 * mobj->scale * P_MobjFlip(mobj));
}
return conditional(
mobj->player == stplyr && stplyr->icecube.frozen,
[&] { return Tooltip(TextElement(

38
src/k_kart.c
View file

@ -5445,8 +5445,13 @@ static void K_HandleTumbleBounce(player_t *player)
S_StartSound(player->mo, (player->tumbleHeight < 40) ? sfx_s3k5d : sfx_s3k5f); // s3k5d is bounce < 50, s3k5f otherwise!
player->mo->momx = player->mo->momx / 2;
player->mo->momy = player->mo->momy / 2;
if (!(player->pflags2 & PF2_FASTTUMBLEBOUNCE))
{
player->mo->momx = player->mo->momx / 2;
player->mo->momy = player->mo->momy / 2;
}
player->pflags2 &= ~PF2_FASTTUMBLEBOUNCE;
// and then modulate momz like that...
player->mo->momz = K_TumbleZ(player->mo, player->tumbleHeight * FRACUNIT);
@ -10984,12 +10989,20 @@ void K_KartResetPlayerColor(player_t *player)
}
}
if (player->ballhogcharge && player->ballhogburst >= (BALLHOG_BURST_FUSE/2))
if (player->ballhogcharge && player->ballhogburst >= (2*BALLHOG_BURST_FUSE/3))
{
player->mo->colorized = true;
player->mo->color = (player->ballhogburst % 2) ? SKINCOLOR_CRIMSON : SKINCOLOR_BLACK;
fullbright = true;
goto finalise;
}
if (player->ballhogcharge && player->ballhogburst >= (BALLHOG_BURST_FUSE/3))
{
if (player->ballhogburst % 2 == 0)
{
player->mo->colorized = true;
player->mo->color = SKINCOLOR_KETCHUP;
player->mo->color = SKINCOLOR_CRIMSON;
fullbright = true;
goto finalise;
}
@ -14729,8 +14742,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
player->ballhogburst++;
if (player->ballhogburst == BALLHOG_BURST_FUSE/2)
if (player->ballhogburst == 2*BALLHOG_BURST_FUSE/3)
S_StartSound(player->mo, sfx_gshb8);
if (player->ballhogburst == BALLHOG_BURST_FUSE/3)
S_StartSound(player->mo, sfx_gshda);
else if (player->ballhogburst == BALLHOG_BURST_FUSE)
{
K_PlayBoostTaunt(player->mo);
@ -14739,26 +14756,33 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
K_DoSneaker(player, 0);
}
S_StopSoundByID(player->mo, sfx_gshda);
mobj_t *boom = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_THOK);
P_SetMobjState(boom, S_BALLHOGBOOM);
boom->scale = player->mo->scale + (player->mo->scale / 4 * player->itemamount);
// boom->momx = player->mo->momx/2;
// boom->momy = player->mo->momy/2;
// boom->momz = player->mo->momz/2;
boom->color = player->skincolor;
boom->colorized = true;
S_StartSound(player->mo, mobjinfo[MT_BALLHOG].deathsound);
K_StumblePlayer(player);
K_AddHitLag(player->mo, TICRATE/4, false);
player->tumbleBounces = 10;
player->tumbleBounces = TUMBLEBOUNCES;
P_Thrust(player->mo, player->mo->angle, 240 * player->mo->scale);
P_Thrust(player->mo, player->mo->angle, (40 + 10 * player->itemamount) * player->mo->scale);
player->pflags2 |= PF2_FASTTUMBLEBOUNCE;
/*
if (onground)
player->mo->momz += 10*player->mo->scale;
else
player->mo->momz -= 50*player->mo->scale;
*/
player->itemamount = 0;
player->botvars.itemconfirm = 0;

2
src/k_kart.h
View file

@ -68,7 +68,7 @@ Make sure this matches the actual number of states
#define FLAMESHIELD_MAX (120)
#define BALLHOG_BURST_FUSE (TICRATE)
#define BALLHOG_BURST_FUSE (TICRATE*2)
#define RR_PROJECTILE_FUSE (8*TICRATE)