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

WIP: Trickpanel crack IV

Browse source
This commit is contained in:
AJ Martinez 2023-11-09 02:02:41 -07:00
parent c11394ce83
commit 19edcbe9c2
5 changed files with 45 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_player.h
View file

@ -898,11 +898,11 @@ struct player_t
UINT16 wavedash; // How long is our chained sliptide? Grant a proportional boost when it's over.
UINT8 wavedashdelay; // How long since the last sliptide? Only boost once you've been straightened out for a bit.
UINT16 wavedashboost; // The actual boost granted from wavedash.
UINT16 trickdashboost; // Trickdashes grant a snappier boost that permits sliptide. [UNUSED, TOO MUCH CRACK]
boolean trickdash; // Is the wavedash we're charging right now getting upgraded to a trickdash? [UNUSED]
UINT16 trickcharge; // Landed normally from a trick panel? Get the benefits package!
UINT16 infinitether; // Generic infinitether time, used for infinitether leniency.
UINT8 lastsafelap;
mobj_t *stumbleIndicator;

84
src/k_kart.c
View file

@ -1263,10 +1263,10 @@ static boolean K_HasInfiniteTether(player_t *player)
if (player->eggmanexplode > 0)
return true;
if (player->trickdash)
if (player->trickcharge)
return true;
if (player->trickcharge)
if (player->infinitether)
return true;
return false;
@ -1887,9 +1887,9 @@ static void K_SpawnGenericSpeedLines(player_t *player, boolean top)
fast->colorized = true;
fast->renderflags |= RF_ADD;
}
else if (player->wavedashboost || player->trickdashboost)
else if (player->wavedashboost)
{
fast->color = (player->trickdashboost) ? K_RainbowColor(leveltime) : SKINCOLOR_WHITE;
fast->color = SKINCOLOR_WHITE;
fast->colorized = true;
}
else if (player->ringboost)
@ -3243,14 +3243,9 @@ static void K_GetKartBoostPower(player_t *player)
ADDBOOST(8*FRACUNIT/10, 4*FRACUNIT, 2*SLIPTIDEHANDLING/5); // + 80% top speed, + 400% acceleration, +20% handling
}
if (player->trickdashboost)
{
ADDBOOST(8*FRACUNIT/10, 8*FRACUNIT, 3*SLIPTIDEHANDLING/5); // + 80% top speed, + 800% acceleration, +30% handling
}
if (player->trickcharge)
{
ADDBOOST(0, 0, 2*SLIPTIDEHANDLING/10); // 0% speed 0% accel 20% handle
ADDBOOST(0, FRACUNIT, 2*SLIPTIDEHANDLING/10); // 0% speed 100% accel 20% handle
}
if (player->spindashboost) // Spindash boost
@ -4340,17 +4335,6 @@ void K_UpdateWavedashIndicator(player_t *player)
// Storing boost
mobj->rollangle += 3*ANG15/4;
}
if (player->trickdash)
{
mobj->sprite = SPR_TRBS;
mobj->renderflags |= RF_ADD;
}
else
{
mobj->sprite = SPR_SLPT;
mobj->renderflags &= ~RF_ADD;
}
}
static mobj_t *K_TrickCatholocismBlast(mobj_t *trickIndicator, fixed_t destscale, angle_t rollangle)
@ -8134,7 +8118,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->sneakertimer || player->ringboost
|| player->driftboost || player->startboost
|| player->eggmanexplode || player->trickboost
|| player->gateBoost || player->wavedashboost || player->trickdashboost)
|| player->gateBoost || player->wavedashboost)
{
#if 0
if (player->invincibilitytimer)
@ -8425,11 +8409,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->wavedashboost--;
}
if (player->trickdashboost > 0 && onground == true)
{
player->trickdashboost--;
}
if (player->trickcharge > 0 && onground == true)
{
player->trickcharge--;
@ -8437,6 +8416,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->trickcharge = max(player->trickcharge, 1);
}
if (player->infinitether > 0)
{
player->infinitether--;
}
if (player->spindashboost)
{
player->spindashboost--;
@ -8549,6 +8533,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->dotrickfx && !player->mo->hitlag)
{
S_StartSound(player->mo, sfx_trick1);
player->trickcharge = 8*TICRATE;
player->dotrickfx = false;
}
@ -9845,6 +9830,8 @@ static void K_KartDrift(player_t *player, boolean onground)
const UINT16 buttons = K_GetKartButtons(player);
boolean dokicker = false;
// Drifting is actually straffing + automatic turning.
// Holding the Jump button will enable drifting.
// (This comment is extremely funny)
@ -9907,6 +9894,7 @@ static void K_KartDrift(player_t *player, boolean onground)
K_SpawnDriftBoostExplosion(player, 3);
K_SpawnDriftElectricSparks(player, K_DriftSparkColor(player, player->driftcharge), false);
dokicker = true;
}
else if (player->driftcharge >= dsfour)
{
@ -9921,15 +9909,17 @@ static void K_KartDrift(player_t *player, boolean onground)
K_SpawnDriftBoostExplosion(player, 4);
K_SpawnDriftElectricSparks(player, K_DriftSparkColor(player, player->driftcharge), false);
dokicker = true;
}
if (player->trickcharge)
if (player->trickcharge && dokicker)
{
player->driftboost += 20;
player->wavedashboost += 10;
P_Thrust(player->mo, pushdir, player->speed / 2);
S_StartSound(player->mo, sfx_gshba);
player->trickcharge = 0;
player->infinitether = TICRATE*2;
}
}
@ -9983,7 +9973,6 @@ static void K_KartDrift(player_t *player, boolean onground)
// And take away wavedash properties: advanced cornering demands advanced finesse
player->wavedash = 0;
player->wavedashboost = 0;
player->trickdashboost = 0;
}
else if ((player->pflags & PF_DRIFTINPUT) && player->drift != 0)
{
@ -10050,7 +10039,7 @@ static void K_KartDrift(player_t *player, boolean onground)
}
if (player->trickcharge && driftadditive)
driftadditive += 24;
driftadditive += 16;
// This spawns the drift sparks
if ((player->driftcharge + driftadditive >= dsone)
@ -10174,20 +10163,10 @@ static void K_KartDrift(player_t *player, boolean onground)
fixed_t yourPower = maxZipPower - FixedMul(yourPowerReduction, powerSpread);
int yourBoost = FixedInt(FixedMul(yourPower, player->wavedash/10 * FRACUNIT));
if (player->trickdash)
{
player->trickdashboost += 3*yourBoost/2;
S_StartSoundAtVolume(player->mo, sfx_gshba, 255);
}
else
{
player->wavedashboost += yourBoost;
}
player->wavedashboost += yourBoost;
S_StartSoundAtVolume(player->mo, sfx_waved3, 255); // Boost
player->trickdash = 0;
K_SpawnDriftBoostExplosion(player, 0);
}
S_StopSoundByID(player->mo, sfx_waved1);
@ -10841,7 +10820,7 @@ static void K_KartSpindash(player_t *player)
K_KartSpindashWind(player->mo);
}
if ((player->wavedashboost > 0 || player->trickdashboost > 0) && (spawnWind == true))
if ((player->wavedashboost > 0) && (spawnWind == true))
{
K_KartSpindashWind(player->mo);
}
@ -12284,6 +12263,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
S_StartSound(player->mo, sfx_trick0);
player->dotrickfx = true;
// Calculate speed boost decay:
// Base speed boost duration is 35 tics.
// At most, lose 3/4th of your boost.
player->trickboostdecay = min(TICRATE*3/4, abs(momz/FRACUNIT));
if (cmd->turning > 0)
@ -12319,10 +12302,15 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
S_StartSound(player->mo, sfx_trick0);
player->dotrickfx = true;
// Calculate speed boost decay:
// Base speed boost duration is 35 tics.
// At most, lose 3/4th of your boost.
player->trickboostdecay = min(TICRATE*3/4, abs(momz/FRACUNIT));
if (cmd->throwdir > 0) // forward trick
{
if (player->mo->momz * P_MobjFlip(player->mo) > 0)
{
player->mo->momz = 0;
@ -12348,12 +12336,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->mo->momz = 0; // relative = false;
}
// Calculate speed boost decay:
// Base speed boost duration is 35 tics.
// At most, lose 3/4th of your boost.
player->trickboostdecay = min(TICRATE*3/4, abs(momz/FRACUNIT));
//CONS_Printf("decay: %d\n", player->trickboostdecay);
player->mo->momz += P_MobjFlip(player->mo)*48*mapobjectscale;
player->trickpanel = TRICKSTATE_BACK;
@ -12442,6 +12424,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->mo->hitlag = 3;
S_StartSound(player->mo, sfx_gshac); // TODO
player->fastfall = 0; // intentionally skip bounce
player->trickcharge = 0;
}
else
{
@ -12450,9 +12433,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
UINT8 award = TICRATE - player->trickboostdecay;
//player->trickboost = award;
player->trickcharge += award*4;
K_AwardPlayerRings(player, award/2, true);
player->trickboost = award;
K_AwardPlayerRings(player, award, true);
if (player->trickpanel == TRICKSTATE_FORWARD)
player->trickboostpower /= 18;

4
src/k_respawn.c
View file

@ -156,9 +156,9 @@ void K_DoIngameRespawn(player_t *player)
player->ringboost = 0;
player->driftboost = player->strongdriftboost = 0;
player->gateBoost = 0;
player->trickdash = 0;
player->trickcharge = 0;
player->wavedash = player->wavedashboost = player->wavedashdelay = player->trickdashboost = 0;
player->infinitether = 0;
player->wavedash = player->wavedashboost = player->wavedashdelay = 0;
K_TumbleInterrupt(player);
P_ResetPlayer(player);

12
src/lua_playerlib.c
View file

@ -333,10 +333,8 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->wavedashboost);
else if (fastcmp(field,"trickcharge"))
lua_pushinteger(L, plr->trickcharge);
//else if (fastcmp(field,"trickdashboost"))
// lua_pushinteger(L, plr->trickdashboost);
//else if (fastcmp(field,"trickdash"))
// lua_pushinteger(L, plr->trickdash);
else if (fastcmp(field,"infinitether"))
lua_pushinteger(L, plr->infinitether);
else if (fastcmp(field,"lastsafelap"))
lua_pushinteger(L, plr->lastsafelap);
else if (fastcmp(field,"instaWhipCharge"))
@ -823,10 +821,8 @@ static int player_set(lua_State *L)
plr->wavedashboost = luaL_checkinteger(L, 3);
else if (fastcmp(field,"trickcharge"))
plr->trickcharge = luaL_checkinteger(L, 3);
//else if (fastcmp(field,"trickdashboost"))
// plr->trickdashboost = luaL_checkinteger(L, 3);
//else if (fastcmp(field,"trickdash"))
// plr->trickdash = luaL_checkinteger(L, 3);
else if (fastcmp(field,"infinitether"))
plr->infinitether = luaL_checkinteger(L, 3);
else if (fastcmp(field,"lastsafelap"))
plr->lastsafelap = luaL_checkinteger(L, 3);
else if (fastcmp(field,"instaWhipCharge"))

8
src/p_saveg.c
View file

@ -545,10 +545,10 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEUINT16(save->p, players[i].wavedash);
WRITEUINT8(save->p, players[i].wavedashdelay);
WRITEUINT16(save->p, players[i].wavedashboost);
WRITEUINT8(save->p, players[i].trickdash);
WRITEUINT16(save->p, players[i].trickdashboost);
WRITEUINT16(save->p, players[i].trickcharge);
WRITEUINT16(save->p, players[i].infinitether);
WRITEUINT8(save->p, players[i].lastsafelap);
WRITEMEM(save->p, players[i].public_key, PUBKEYLENGTH);
@ -1066,10 +1066,10 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].wavedash = READUINT16(save->p);
players[i].wavedashdelay = READUINT8(save->p);
players[i].wavedashboost = READUINT16(save->p);
players[i].trickdash = READUINT8(save->p);
players[i].trickdashboost = READUINT16(save->p);
players[i].trickcharge = READUINT16(save->p);
players[i].infinitether = READUINT16(save->p);
players[i].lastsafelap = READUINT8(save->p);
READMEM(save->p, players[i].public_key, PUBKEYLENGTH);