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

Merge branch 'whip-warning' into 'master'

Browse source 
Whip awareness

See merge request kart-krew-dev/ring-racers-internal!2929
This commit is contained in:
AJ Martinez 2025-10-11 06:46:03 +00:00
commit 0bcadb7ffe
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/k_hud.cpp
View file

@ -4235,7 +4235,7 @@ static boolean K_drawKartLaps(void)
K_DrawMarginSticker(fr-1+(flipflag ? 2 : 0), fy+1, 25+bump, V_HUDTRANS|V_SLIDEIN|splitflags, true, flipflag); K_DrawMarginSticker(fr-1+(flipflag ? 2 : 0), fy+1, 25+bump, V_HUDTRANS|V_SLIDEIN|splitflags, true, flipflag);
// WHAT IS THIS? // WHAT IS THIS?
// WHAT ARE YOU FUCKING TALKING ABOUT? // WHAT ARE YOU FUCKING TALKING ABOUT?
if (franticitems) if (franticitems)
{ {
V_DrawMappedPatch(fr, fy, V_HUDTRANS|V_SLIDEIN|splitflags, kp_exp[1], R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PURPLE, GTC_CACHE)); V_DrawMappedPatch(fr, fy, V_HUDTRANS|V_SLIDEIN|splitflags, kp_exp[1], R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PURPLE, GTC_CACHE));
@ -5135,7 +5135,7 @@ static void K_drawKartWanted(void)
static void K_drawKartPlayerCheck(void) static void K_drawKartPlayerCheck(void)
{ {
const fixed_t maxdistance = FixedMul(1280 * mapobjectscale, K_GetKartGameSpeedScalar(gamespeed)); const fixed_t maxdistance = FixedMul(2000 * mapobjectscale, K_GetKartGameSpeedScalar(gamespeed));
UINT8 i; UINT8 i;
INT32 splitflags = V_SNAPTOBOTTOM|V_SPLITSCREEN; INT32 splitflags = V_SNAPTOBOTTOM|V_SPLITSCREEN;
fixed_t y = CHEK_Y * FRACUNIT; fixed_t y = CHEK_Y * FRACUNIT;
@ -5193,6 +5193,8 @@ static void K_drawKartPlayerCheck(void)
distance = R_PointToDist2(pPos.x, pPos.y, v.x, v.y); distance = R_PointToDist2(pPos.x, pPos.y, v.x, v.y);
colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(checkplayer->mo->color), GTC_CACHE);
if (distance > maxdistance) if (distance > maxdistance)
{ {
// Too far away // Too far away
@ -5212,12 +5214,18 @@ static void K_drawKartPlayerCheck(void)
{ {
pnum += 2; pnum += 2;
} }
else if ((checkplayer->instaWhipCharge) && !(cv_reducevfx.value))
{
if (leveltime & 2)
R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(SKINCOLOR_WHITE), GTC_CACHE);
else
R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(SKINCOLOR_BLACK), GTC_CACHE);
}
K_ObjectTracking(&result, &v, true); K_ObjectTracking(&result, &v, true);
if (result.onScreen == true) if (result.onScreen == true)
{ {
colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(checkplayer->mo->color), GTC_CACHE);
V_DrawFixedPatch(result.x, y, FRACUNIT, V_HUDTRANS|V_SPLITSCREEN|splitflags, kp_check[pnum], colormap); V_DrawFixedPatch(result.x, y, FRACUNIT, V_HUDTRANS|V_SPLITSCREEN|splitflags, kp_check[pnum], colormap);
} }
} }

10
src/k_kart.c
View file

@ -1486,6 +1486,14 @@ static void K_DrawDraftCombiring(player_t *player, mobj_t *victim, fixed_t curdi
} }
band->color = colors[c]; band->color = colors[c];
if (player->instaWhipCharge && ((leveltime%2) == 0))
{
band->color = SKINCOLOR_WHITE;
P_SetScale(band, band->destscale = (3*band->destscale) / 2);
}
band->colorized = true; band->colorized = true;
band->fuse = 2; band->fuse = 2;
@ -14400,7 +14408,7 @@ void K_DappleEmployment(player_t *player)
K_StumblePlayer(player); K_StumblePlayer(player);
player->preventfailsafe = TICRATE*3; player->preventfailsafe = TICRATE*3;
S_StopSoundByID(player->mo, sfx_s3k9b); // Avoid stumble crunch noise S_StopSoundByID(player->mo, sfx_s3k9b); // Avoid stumble crunch noise
} }
} }
} }