Tweak around recovery dash numbers a bit
This commit is contained in:
parent
89d2fd24f6
commit
b2ee66cffb
3 changed files with 18 additions and 7 deletions
|
|
@ -1810,6 +1810,11 @@ struct int_const_s const INT_CONST[] = {
|
||||||
|
|
||||||
{"BLANKART", 1},
|
{"BLANKART", 1},
|
||||||
|
|
||||||
|
// recoverydash stuff
|
||||||
|
{"RECOVERYDASHADD", RECOVERYDASHADD},
|
||||||
|
{"RECOVERYDASHCHARGETIME", RECOVERYDASHCHARGETIME},
|
||||||
|
{"RECOVERYDASHWIPETIME", RECOVERYDASHWIPETIME},
|
||||||
|
|
||||||
// airdroptype_t
|
// airdroptype_t
|
||||||
{"AIRDROP_NONE", AIRDROP_NONE},
|
{"AIRDROP_NONE", AIRDROP_NONE},
|
||||||
{"AIRDROP_LIGHT", AIRDROP_LIGHT},
|
{"AIRDROP_LIGHT", AIRDROP_LIGHT},
|
||||||
|
|
|
||||||
14
src/k_kart.c
14
src/k_kart.c
|
|
@ -9956,7 +9956,7 @@ static void K_RecoveryDash(player_t *player)
|
||||||
{
|
{
|
||||||
player->pflags &= ~PF_RECOVERYSPIN;
|
player->pflags &= ~PF_RECOVERYSPIN;
|
||||||
player->forcedtopspeed = 0;
|
player->forcedtopspeed = 0;
|
||||||
if (player->recoverydashcharge >= 2*TICRATE && (player->cmd.buttons & BT_ACCELERATE))
|
if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME && (player->cmd.buttons & BT_ACCELERATE))
|
||||||
{
|
{
|
||||||
player->outrun = TICRATE/4;
|
player->outrun = TICRATE/4;
|
||||||
player->recoverydash = TICRATE;
|
player->recoverydash = TICRATE;
|
||||||
|
|
@ -9972,11 +9972,11 @@ static void K_RecoveryDash(player_t *player)
|
||||||
if (P_IsObjectOnGround(player->mo))
|
if (P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
player->recoverydashcharge += 1;
|
player->recoverydashcharge += 1;
|
||||||
K_SpawnWipeoutTrail(player->mo, (player->recoverydashcharge < 3*TICRATE/2));
|
K_SpawnWipeoutTrail(player->mo, (player->recoverydashcharge < RECOVERYDASHWIPETIME));
|
||||||
|
|
||||||
if (leveltime % 6 == 0)
|
if (leveltime % 6 == 0)
|
||||||
{
|
{
|
||||||
if (player->recoverydashcharge < 2*TICRATE)
|
if (player->recoverydashcharge < RECOVERYDASHCHARGETIME)
|
||||||
{
|
{
|
||||||
S_StartSound(player->mo, sfx_s225);
|
S_StartSound(player->mo, sfx_s225);
|
||||||
}
|
}
|
||||||
|
|
@ -10007,7 +10007,7 @@ static void K_RecoveryDash(player_t *player)
|
||||||
|
|
||||||
P_SetMobjState(skid, S_RECSPIN_SKID);
|
P_SetMobjState(skid, S_RECSPIN_SKID);
|
||||||
K_MatchGenericExtraFlags(skid, player->mo);
|
K_MatchGenericExtraFlags(skid, player->mo);
|
||||||
if (player->recoverydashcharge >= 2*TICRATE)
|
if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME)
|
||||||
{
|
{
|
||||||
skid->renderflags |= RF_TRANS20;
|
skid->renderflags |= RF_TRANS20;
|
||||||
}
|
}
|
||||||
|
|
@ -10020,9 +10020,9 @@ static void K_RecoveryDash(player_t *player)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->recoverydashcharge >= 2*TICRATE)
|
if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME)
|
||||||
{
|
{
|
||||||
if (player->recoverydashcharge == 2*TICRATE)
|
if (player->recoverydashcharge == RECOVERYDASHCHARGETIME)
|
||||||
S_StartSound(player->mo, sfx_s3ka2);
|
S_StartSound(player->mo, sfx_s3ka2);
|
||||||
|
|
||||||
if (leveltime & 1)
|
if (leveltime & 1)
|
||||||
|
|
@ -10045,7 +10045,7 @@ static void K_RecoveryDash(player_t *player)
|
||||||
spark->angle = sparkangle;
|
spark->angle = sparkangle;
|
||||||
spark->color = SKINCOLOR_WHITE;
|
spark->color = SKINCOLOR_WHITE;
|
||||||
|
|
||||||
if (player->recoverydashcharge >= 2*TICRATE + TICRATE/4)
|
if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME + TICRATE/4)
|
||||||
{
|
{
|
||||||
P_SetMobjState(spark, S_DRIFTSPARK_B1);
|
P_SetMobjState(spark, S_DRIFTSPARK_B1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -434,6 +434,12 @@ typedef enum
|
||||||
|
|
||||||
boolean K_NullDriftTiltEnalbed();
|
boolean K_NullDriftTiltEnalbed();
|
||||||
|
|
||||||
|
#define RECOVERYDASHADD (TICRATE/3)
|
||||||
|
//og val 2*TICRATE
|
||||||
|
#define RECOVERYDASHCHARGETIME (TICRATE+RECOVERYDASHADD)
|
||||||
|
//og val 3*TICRATE/2
|
||||||
|
#define RECOVERYDASHWIPETIME ((2*TICRATE/2)+RECOVERYDASHADD)
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue