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

Revert "WIP: Timer Duel"

Browse source 
This reverts commit 1d83dddab8.
This commit is contained in:
AJ Martinez 2024-09-03 05:11:00 -07:00
parent 7b3e7cfdc7
commit 2f164cf1b8
8 changed files with 25 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -927,7 +927,6 @@ struct player_t
INT32 checkpointId; // Players respawn here, objects/checkpoint.cpp
INT16 duelscore;
tic_t dueltimer;
UINT8 ctfteam; // 0 == Spectator, 1 == Red, 2 == Blue

12
src/g_game.c
View file

@ -2180,9 +2180,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
UINT8 lastsafecheatcheck;
UINT16 bigwaypointgap;
INT16 duelscore;
tic_t dueltimer;
roundconditions_t roundconditions;
boolean saveroundconditions;
@ -2338,9 +2335,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
bigwaypointgap = 0;
tallyactive = false;
dueltimer = 15*TICRATE;
duelscore = 0;
}
else
{
@ -2391,9 +2385,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
lastsafecheatcheck = players[player].lastsafecheatcheck;
bigwaypointgap = players[player].bigwaypointgap;
duelscore = players[player].duelscore;
dueltimer = players[player].dueltimer;
tallyactive = players[player].tally.active;
if (tallyactive)
{
@ -2531,9 +2522,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->griefValue = griefValue;
p->griefStrikes = griefStrikes;
p->dueltimer = dueltimer;
p->duelscore = duelscore;
memcpy(&p->itemRoulette, &itemRoulette, sizeof (p->itemRoulette));
memcpy(&p->respawn, &respawn, sizeof (p->respawn));

50
src/k_hud.cpp
View file

@ -2628,38 +2628,11 @@ void PositionFacesInfo::draw_1p()
;
else if (gametyperules & GTR_CIRCUIT)
{
if (inDuel)
{
INT32 flags = V_HUDTRANS | V_SLIDEIN | V_SNAPTOLEFT;
colormap = NULL;
if (K_PlayerLosingDuel(&players[rankplayer[i]]) || players[rankplayer[i]].dueltimer == 0)
{
colormap = R_GetTranslationColormap(TC_RAINBOW, (players[rankplayer[i]].dueltimer == 0) ? SKINCOLOR_CRIMSON : SKINCOLOR_TANGERINE, GTC_CACHE);
flags |= V_STRINGDANCE;
}
V_DrawStringScaled(
(FACE_X - 5) * FRACUNIT,
(Y + 10) * FRACUNIT,
FRACUNIT,
FRACUNIT,
FRACUNIT,
flags,
colormap,
PINGF_FONT,
va("%02d.%02d", players[rankplayer[i]].dueltimer/TICRATE, (players[rankplayer[i]].dueltimer%TICRATE)*100/TICRATE)
);
}
else
{
INT32 pos = players[rankplayer[i]].position;
if (pos < 0 || pos > MAXPLAYERS)
pos = 0;
// Draws the little number over the face
V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_facenum[pos]);
}
INT32 pos = players[rankplayer[i]].position;
if (pos < 0 || pos > MAXPLAYERS)
pos = 0;
// Draws the little number over the face
V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SLIDEIN|V_SNAPTOLEFT, kp_facenum[pos]);
}
else if (gametyperules & GTR_POINTLIMIT)
{
@ -3024,6 +2997,19 @@ static void K_drawKartLaps(void)
// I do not understand the way this system of offsets is laid out at all,
// so it's probably going to be pretty bad to maintain. Sorry.
if (inDuel)
{
UINT32 flashflag = (stplyr->duelscore >= 0) ? V_BLUEMAP : V_REDMAP;
if (leveltime % 2)
if (abs(stplyr->duelscore) >= 2)
flashflag = V_YELLOWMAP;
if (stplyr->duelscore >= 0)
V_DrawCenteredString(BASEVIDWIDTH/2, 5, flashflag, va("+%d", stplyr->duelscore));
else
V_DrawCenteredString(BASEVIDWIDTH/2, 5, flashflag, va("%d", stplyr->duelscore));
}
if (numlaps != 1)
{
if (r_splitscreen > 1)

47
src/k_kart.c
View file

@ -4147,23 +4147,19 @@ void K_CheckpointCrossAward(player_t *player)
K_AwardPlayerRings(player, (player->bot ? 20 : 10), true);
// Update Duel scoring.
if (inDuel)
if (inDuel && player->position == 1)
{
player->duelscore += 1;
if (player->position == 1)
{
tic_t effectiveleveltime = min(leveltime, DUELTIMER_NOBONUS);
player->dueltimer += Easing_Linear(effectiveleveltime*FRACUNIT/DUELTIMER_NOBONUS, DUELTIMER_BONUS, 0);
player->dueltimer = min(player->dueltimer, DUELTIMER_MAX);
}
for (UINT8 i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator && &players[i] != player)
{
players[i].duelscore -= 1;
}
}
if (player->duelscore == 3)
{
P_DoPlayerExit(player, 0);
P_DoAllPlayersExit(PF_NOCONTEST, 0);
}
}
@ -7620,19 +7616,6 @@ SINT8 K_GetTotallyRandomResult(UINT8 useodds)
return i;
}
boolean K_PlayerLosingDuel(player_t *player)
{
for (UINT8 i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator && &players[i] != player)
{
if (players[i].duelscore > player->duelscore)
return true;
}
}
return false;
}
mobj_t *K_CreatePaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 flip, UINT8 type, UINT16 amount)
{
mobj_t *drop = P_SpawnMobj(x, y, z, MT_FLOATINGITEM);
@ -9402,22 +9385,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->invincibilitytimer--;
}
if (inDuel && K_PlayerLosingDuel(player))
{
if (player->dueltimer)
{
player->dueltimer--;
if (!(player->dueltimer % 4) && P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_s3k55);
if (player->dueltimer == 0)
{
P_DoTimeOver(player);
P_DoAllPlayersExit(0, false);
}
}
}
if (!player->invincibilitytimer)
player->invincibilityextensions = 0;

6
src/k_kart.h
View file

@ -88,11 +88,6 @@ Make sure this matches the actual number of states
#define AUTORESPAWN_TIME (10*TICRATE)
#define AUTORESPAWN_THRESHOLD (7*TICRATE)
#define DUELTIMER_START (10*TICRATE)
#define DUELTIMER_BONUS (2*TICRATE)
#define DUELTIMER_MAX (3*DUELTIMER_START/2)
#define DUELTIMER_NOBONUS (60*TICRATE)
angle_t K_ReflectAngle(angle_t angle, angle_t against, fixed_t maxspeed, fixed_t yourspeed);
boolean K_IsDuelItem(mobjtype_t type);
@ -208,7 +203,6 @@ void K_SpawnDriftElectricSparks(player_t *player, int color, boolean shockwave);
void K_KartUpdatePosition(player_t *player);
void K_UpdateAllPlayerPositions(void);
SINT8 K_GetTotallyRandomResult(UINT8 useodds);
boolean K_PlayerLosingDuel(player_t *player);
mobj_t *K_CreatePaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 flip, UINT8 type, UINT16 amount);
mobj_t *K_FlingPaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8 flip, UINT8 type, UINT16 amount);
void K_DropPaperItem(player_t *player, UINT8 itemtype, UINT16 itemamount);

4
src/lua_playerlib.c
View file

@ -677,8 +677,6 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->cheatchecknum);
else if (fastcmp(field,"duelscore"))
lua_pushinteger(L, plr->duelscore);
else if (fastcmp(field,"dueltimer"))
lua_pushinteger(L, plr->dueltimer);
else if (fastcmp(field,"lastsidehit"))
lua_pushinteger(L, plr->lastsidehit);
else if (fastcmp(field,"lastlinehit"))
@ -1252,8 +1250,6 @@ static int player_set(lua_State *L)
plr->cheatchecknum = (INT32)luaL_checkinteger(L, 3);
else if (fastcmp(field,"duelscore"))
plr->duelscore = (INT16)luaL_checkinteger(L, 3);
else if (fastcmp(field,"dueltimer"))
plr->dueltimer = (UINT32)luaL_checkinteger(L, 3);
else if (fastcmp(field,"lastsidehit"))
plr->lastsidehit = (INT16)luaL_checkinteger(L, 3);
else if (fastcmp(field,"lastlinehit"))

2
src/p_inter.c
View file

@ -1544,8 +1544,6 @@ boolean P_CheckRacers(void)
const boolean griefed = (spectateGriefed > 0);
boolean eliminateLast = (!K_CanChangeRules(true) || (cv_karteliminatelast.value != 0));
if (inDuel)
eliminateLast = false;
boolean allHumansDone = true;
//boolean allBotsDone = true;

2
src/p_saveg.c
View file

@ -285,7 +285,6 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEINT32(save->p, players[i].exp);
WRITEUINT16(save->p, players[i].gradingpointnum);
WRITEINT16(save->p, players[i].duelscore);
WRITEUINT32(save->p, players[i].dueltimer);
WRITEINT32(save->p, players[i].cheatchecknum);
WRITEINT32(save->p, players[i].checkpointId);
@ -958,7 +957,6 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].exp = READINT32(save->p);
players[i].gradingpointnum = READUINT16(save->p);
players[i].duelscore = READINT16(save->p);
players[i].dueltimer = READUINT32(save->p);
players[i].cheatchecknum = READINT32(save->p);
players[i].checkpointId = READINT32(save->p);