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

Bubble blowup has a brief mercy period before it shoots

Browse source
This commit is contained in:
TehRealSalt 2019-05-26 21:14:26 -04:00
parent ed316ff4bd
commit 068db36368
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -6508,7 +6508,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
S_StartSound(player->mo, sfx_s3k75); S_StartSound(player->mo, sfx_s3k75);
player->kartstuff[k_bubbleblowup]++; player->kartstuff[k_bubbleblowup]++;
player->kartstuff[k_bubblecool] = player->kartstuff[k_bubbleblowup]*3; player->kartstuff[k_bubblecool] = player->kartstuff[k_bubbleblowup]*3;
if (player->kartstuff[k_bubbleblowup] > bubbletime) if (player->kartstuff[k_bubbleblowup] > bubbletime+10)
{ {
K_ThrowKartItem(player, (player->kartstuff[k_throwdir] > 0), MT_BUBBLESHIELDTRAP, -1, 0); K_ThrowKartItem(player, (player->kartstuff[k_throwdir] > 0), MT_BUBBLESHIELDTRAP, -1, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);

4
src/p_mobj.c
View file

@ -8439,6 +8439,8 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->target->player->kartstuff[k_bubbleblowup]) if (mobj->target->player->kartstuff[k_bubbleblowup])
{ {
INT32 blow = mobj->target->player->kartstuff[k_bubbleblowup]; INT32 blow = mobj->target->player->kartstuff[k_bubbleblowup];
if (blow > bubbletime)
blow = bubbletime;
if (curstate != S_BUBBLESHIELDBLOWUP) if (curstate != S_BUBBLESHIELDBLOWUP)
P_SetMobjState(mobj, S_BUBBLESHIELDBLOWUP); P_SetMobjState(mobj, S_BUBBLESHIELDBLOWUP);
@ -8448,6 +8450,8 @@ void P_MobjThinker(mobj_t *mobj)
scale += (blow * (3*scale)) / bubbletime; scale += (blow * (3*scale)) / bubbletime;
mobj->frame = (states[S_BUBBLESHIELDBLOWUP].frame + mobj->extravalue1); mobj->frame = (states[S_BUBBLESHIELDBLOWUP].frame + mobj->extravalue1);
if ((mobj->target->player->kartstuff[k_bubbleblowup] > bubbletime) && (leveltime & 1))
mobj->frame = (states[S_BUBBLESHIELDBLOWUP].frame + 5);
if (mobj->extravalue1 < 4 && mobj->extravalue2 < blow && !mobj->cvmem && (leveltime & 1)) // Growing if (mobj->extravalue1 < 4 && mobj->extravalue2 < blow && !mobj->cvmem && (leveltime & 1)) // Growing
{ {