From cf7198f765ff0bdd70ca2bb5fcfaf24d3aac2ec5 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Sat, 15 Sep 2018 01:24:29 -0400 Subject: [PATCH] Updated speed lines --- src/dehacked.c | 3 --- src/info.c | 5 +---- src/info.h | 3 --- src/k_kart.c | 14 +++++++------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 3083b205..05be2583 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6253,9 +6253,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_FASTLINE3", "S_FASTLINE4", "S_FASTLINE5", - "S_FASTLINE6", - "S_FASTLINE7", - "S_FASTLINE8", // Thunder Shield Burst diff --git a/src/info.c b/src/info.c index 00819753..74a7a4d3 100644 --- a/src/info.c +++ b/src/info.c @@ -2584,10 +2584,7 @@ state_t states[NUMSTATES] = {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_FASTLINE3}, // S_FASTLINE2 {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_FASTLINE4}, // S_FASTLINE3 {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_FASTLINE5}, // S_FASTLINE4 - {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_FASTLINE6}, // S_FASTLINE5 - {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_FASTLINE7}, // S_FASTLINE6 - {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_FASTLINE8}, // S_FASTLINE7 - {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_NULL}, // S_FASTLINE8 + {SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_FASTLINE5 {SPR_BOST, FF_FULLBRIGHT|FF_ANIMATE, TICRATE, {NULL}, 6, 1, S_BOOSTSMOKESPAWNER}, // S_BOOSTFLAME {SPR_NULL, 0, TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_BOOSTSMOKESPAWNER diff --git a/src/info.h b/src/info.h index 0fb0f9c1..8d27944f 100644 --- a/src/info.h +++ b/src/info.h @@ -3101,9 +3101,6 @@ typedef enum state S_FASTLINE3, S_FASTLINE4, S_FASTLINE5, - S_FASTLINE6, - S_FASTLINE7, - S_FASTLINE8, // Magnet Burst diff --git a/src/k_kart.c b/src/k_kart.c index 910ee8c1..94cdc399 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3314,16 +3314,16 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) K_GetKartBoostPower(player); // Speed lines - if (player->kartstuff[k_speedboost] > FRACUNIT/8 && (leveltime & 1)) + if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0) { - mobj_t *fast = P_SpawnMobj(player->mo->x + (P_RandomRange(-32,32)<mo->y + (P_RandomRange(-32,32)<mo->z + (player->mo->height/2) + (P_RandomRange(-24,24)<mo->x + (P_RandomRange(-36,36)<mo->y + (P_RandomRange(-36,36)<mo->z + (player->mo->height/2) + (P_RandomRange(-20,20)<angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); - fast->momx = player->mo->momx/2; - fast->momy = player->mo->momy/2; - fast->momz = player->mo->momz/2; + fast->momx = 3*player->mo->momx/4; + fast->momy = 3*player->mo->momy/4; + fast->momz = 3*player->mo->momz/4; } if (player->kartstuff[k_eggmanexplode]) // You're gonna diiiiie