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

Merge branch 'longer-eggbox' into 'master'

Browse source 
Eggmanexplode 4*TICRATE -> 6*TICRATE

See merge request KartKrew/Kart!977
This commit is contained in:
Oni 2023-02-26 02:58:29 +00:00
commit dbc7b27051
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_hud.c
View file

@ -143,7 +143,7 @@ static patch_t *kp_localtag[4][2];
static patch_t *kp_talk; static patch_t *kp_talk;
static patch_t *kp_typdot; static patch_t *kp_typdot;
static patch_t *kp_eggnum[4]; static patch_t *kp_eggnum[6];
static patch_t *kp_flameshieldmeter[104][2]; static patch_t *kp_flameshieldmeter[104][2];
static patch_t *kp_flameshieldmeter_bg[16][2]; static patch_t *kp_flameshieldmeter_bg[16][2];
@ -547,7 +547,7 @@ void K_LoadKartHUDGraphics(void)
// Eggman warning numbers // Eggman warning numbers
sprintf(buffer, "K_EGGNx"); sprintf(buffer, "K_EGGNx");
for (i = 0; i < 4; i++) for (i = 0; i < 6; i++)
{ {
buffer[6] = '0'+i; buffer[6] = '0'+i;
HU_UpdatePatch(&kp_eggnum[i], "%s", buffer); HU_UpdatePatch(&kp_eggnum[i], "%s", buffer);
@ -1429,7 +1429,7 @@ static void K_drawKartItem(void)
// Quick Eggman numbers // Quick Eggman numbers
if (stplyr->eggmanexplode > 1) if (stplyr->eggmanexplode > 1)
V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|V_SLIDEIN|fflags, kp_eggnum[min(3, G_TicsToSeconds(stplyr->eggmanexplode))]); V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|V_SLIDEIN|fflags, kp_eggnum[min(5, G_TicsToSeconds(stplyr->eggmanexplode))]);
if (stplyr->itemtype == KITEM_FLAMESHIELD && stplyr->flamelength > 0) if (stplyr->itemtype == KITEM_FLAMESHIELD && stplyr->flamelength > 0)
{ {

2
src/k_kart.c
View file

@ -11307,7 +11307,7 @@ void K_EggmanTransfer(player_t *source, player_t *victim)
return; return;
K_AddHitLag(victim->mo, 2, true); K_AddHitLag(victim->mo, 2, true);
victim->eggmanexplode = 4*TICRATE; victim->eggmanexplode = 6*TICRATE;
victim->itemRoulette.eggman = false; victim->itemRoulette.eggman = false;
victim->itemRoulette.active = false; victim->itemRoulette.active = false;

2
src/k_roulette.c
View file

@ -1456,7 +1456,7 @@ void K_KartItemRoulette(player_t *const player, ticcmd_t *const cmd)
if (roulette->eggman == true) if (roulette->eggman == true)
{ {
// FATASS JUMPSCARE instead of your actual item // FATASS JUMPSCARE instead of your actual item
player->eggmanexplode = 4*TICRATE; player->eggmanexplode = 6*TICRATE;
//player->karthud[khud_itemblink] = TICRATE; //player->karthud[khud_itemblink] = TICRATE;
//player->karthud[khud_itemblinkmode] = 1; //player->karthud[khud_itemblinkmode] = 1;