thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-03 13:42:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP EXP counter ease

Browse source
This commit is contained in:
Antonio Martinez 2025-06-12 12:06:37 -04:00
parent 9f187529f5
commit 7121e98e71
3 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_player.h
View file

@ -339,6 +339,11 @@ typedef enum
// Tricks
khud_trickcool,
// Exp
khud_oldexp,
khud_exp,
khud_exptimer,
NUMKARTHUD
} karthudtype_t;

20
src/k_hud.cpp
View file

@ -3921,7 +3921,7 @@ static boolean K_drawKartLaps(void)
INT32 bump = 0;
boolean drewsticker = false;
UINT16 displayEXP = stplyr->exp;
UINT16 displayEXP = stplyr->karthud[khud_exp];
// Jesus Christ.
// I do not understand the way this system of offsets is laid out at all,
@ -3999,6 +3999,10 @@ static boolean K_drawKartLaps(void)
}
}
boolean dance = (stplyr->exp > (UINT32)stplyr->karthud[khud_exp]);
INT32 danceflag = dance ? V_STRINGDANCE : 0;
UINT16 dancecolor = dance ? SKINCOLOR_AQUAMARINE : 0;
// EXP
if (displayEXP == UINT16_MAX)
{
@ -4048,9 +4052,15 @@ static boolean K_drawKartLaps(void)
V_DrawMappedPatch(fr, fy, transflag|V_SLIDEIN|splitflags, kp_exp[1], colormap);
// EXP
V_DrawScaledPatch(fr+11, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP/100]);
V_DrawScaledPatch(fr+15, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP/10%10]);
V_DrawScaledPatch(fr+19, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP%10]);
using srb2::Draw;
Draw row = Draw(fr+11, fy).flags(V_HUDTRANS|V_SLIDEIN|splitflags|danceflag).font(Draw::Font::kPing).colorize(dancecolor);
row.text("{:03}", displayEXP);
//V_DrawScaledPatch(fr+11, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP/100]);
//V_DrawScaledPatch(fr+15, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP/10%10]);
//V_DrawScaledPatch(fr+19, fy, V_HUDTRANS|V_SLIDEIN|splitflags, fontv[PINGNUM_FONT].font[displayEXP%10]);
}
else
{
@ -4065,7 +4075,7 @@ static boolean K_drawKartLaps(void)
V_DrawMappedPatch(LAPS_X+bump, LAPS_Y, transflag|V_SLIDEIN|splitflags, kp_exp[0], colormap);
using srb2::Draw;
Draw row = Draw(LAPS_X+23+bump, LAPS_Y+3).flags(V_HUDTRANS|V_SLIDEIN|splitflags).font(Draw::Font::kThinTimer);
Draw row = Draw(LAPS_X+23+bump, LAPS_Y+3).flags(V_HUDTRANS|V_SLIDEIN|splitflags|danceflag).font(Draw::Font::kThinTimer).colorize(dancecolor);
row.text("{:03}", displayEXP);
}

25
src/k_kart.c
View file

@ -8898,6 +8898,31 @@ void K_KartPlayerHUDUpdate(player_t *player)
if (player->positiondelay)
player->positiondelay--;
if (player->exp != (UINT32)player->karthud[khud_oldexp])
{
if (player->exp <= (UINT32)player->karthud[khud_oldexp])
{
player->karthud[khud_oldexp] = 0;
player->karthud[khud_exp] = 0;
player->karthud[khud_exptimer] = 0;
}
else
{
INT32 delta = player->exp - player->karthud[khud_exp];
INT32 speed = max(1, 10-delta);
player->karthud[khud_exptimer]++;
if (player->karthud[khud_exptimer] >= speed)
{
player->karthud[khud_exp]++;
player->karthud[khud_exptimer] = 0;
if (player->exp == (UINT32)player->karthud[khud_exp])
player->karthud[khud_oldexp] = player->exp;
}
}
}
if (!(player->pflags & PF_FAULT || player->pflags & PF_VOID))
player->karthud[khud_fault] = 0;
else if (player->karthud[khud_fault] > 0 && player->karthud[khud_fault] <= 2*TICRATE)