mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Make timer more obvious on grow particles
This commit is contained in:
parent
cee2c25e27
commit
72948ad49d
2 changed files with 19 additions and 4 deletions
|
|
@ -4316,7 +4316,7 @@ state_t states[NUMSTATES] =
|
|||
|
||||
{SPR_HYUU, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_HYUDORO
|
||||
|
||||
{SPR_GRWP, FF_ADD|FF_FULLBRIGHT|FF_ANIMATE, 13, {NULL}, 7, 1, S_NULL}, // S_GROW_PARTICLE
|
||||
{SPR_GRWP, FF_FULLBRIGHT|FF_ANIMATE, 13, {NULL}, 7, 1, S_NULL}, // S_GROW_PARTICLE
|
||||
|
||||
{SPR_SHRG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SHRINK_GUN
|
||||
{SPR_SHRG, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_SHRINK_LASER
|
||||
|
|
@ -24121,7 +24121,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
|
||||
MF_SPECIAL|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
|
|
@ -24202,7 +24202,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
|
||||
MF_SPECIAL|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
|
|
|
|||
17
src/k_kart.c
17
src/k_kart.c
|
|
@ -2288,12 +2288,27 @@ static void K_SpawnGrowShrinkParticles(mobj_t *mo, INT32 timer)
|
|||
{
|
||||
const boolean shrink = (timer < 0);
|
||||
const INT32 maxTime = (10*TICRATE);
|
||||
const INT32 noTime = (2*TICRATE);
|
||||
INT32 spawnFreq = 1;
|
||||
|
||||
mobj_t *particle = NULL;
|
||||
fixed_t particleSpeed = 0;
|
||||
|
||||
spawnFreq = (maxTime - min(maxTime, abs(timer))) / TICRATE / 2;
|
||||
spawnFreq = abs(timer);
|
||||
|
||||
if (spawnFreq < noTime)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
spawnFreq -= noTime;
|
||||
|
||||
if (spawnFreq > maxTime)
|
||||
{
|
||||
spawnFreq = maxTime;
|
||||
}
|
||||
|
||||
spawnFreq = (maxTime - spawnFreq) / TICRATE / 4;
|
||||
if (spawnFreq == 0)
|
||||
{
|
||||
spawnFreq++;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue