thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish da code

Browse source
This commit is contained in:
Sally Coolatta 2022-08-14 17:39:48 -04:00
parent ebb34ff9d4
commit 4899a020e0
3 changed files with 98 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/k_pwrlv.c
View file

@ -87,7 +87,7 @@ INT16 K_CalculatePowerLevelInc(INT16 diff)
diff = -MAXDIFF; diff = -MAXDIFF;
#undef MAXDIFF #undef MAXDIFF
x = ((diff-2)<<FRACBITS) / PWRLVRECORD_START; x = ((diff-2)<<FRACBITS) / PWRLVRECORD_MEDIAN;
for (j = 3; j < 10; j++) // Just skipping to 3 since 0 thru 2 will always just add 0... for (j = 3; j < 10; j++) // Just skipping to 3 since 0 thru 2 will always just add 0...
{ {
@ -114,6 +114,23 @@ INT16 K_CalculatePowerLevelInc(INT16 diff)
return (INT16)(increment >> FRACBITS); return (INT16)(increment >> FRACBITS);
} }
INT16 K_PowerLevelPlacementScore(player_t *player)
{
if ((player->pflags & PF_NOCONTEST) || (player->spectator))
{
return 0;
}
if (gametyperules & GTR_CIRCUIT)
{
return MAXPLAYERS - player->position;
}
else
{
return player->score;
}
}
INT16 K_CalculatePowerLevelAvg(void) INT16 K_CalculatePowerLevelAvg(void)
{ {
fixed_t avg = 0; fixed_t avg = 0;
@ -186,7 +203,9 @@ void K_UpdatePowerLevels(player_t *player)
return; return;
} }
CONS_Printf("Power Level Gain for player %d:\n", playerNum); CONS_Printf("\n========\n");
CONS_Printf("* Power Level change for player %s (LAP %d) *\n", player_names[playerNum], player->latestlap);
CONS_Printf("========\n");
yourPower = clientpowerlevels[playerNum][powerType]; yourPower = clientpowerlevels[playerNum][powerType];
if (yourPower == 0) if (yourPower == 0)
@ -195,21 +214,16 @@ void K_UpdatePowerLevels(player_t *player)
return; return;
} }
CONS_Printf("Player %d's PWR.LV: %d\n", playerNum, yourPower); CONS_Printf("%s's PWR.LV: %d\n", player_names[playerNum], yourPower);
if (gametyperules & GTR_CIRCUIT) yourScore = K_PowerLevelPlacementScore(player);
{ CONS_Printf("%s's gametype score: %d\n", player_names[playerNum], yourScore);
yourScore = MAXPLAYERS - player->position;
}
else
{
yourScore = player->score;
}
CONS_Printf("========\n");
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
UINT16 theirScore = 0; UINT16 theirScore = 0;
INT16 theirPower = PWRLVRECORD_DEF; INT16 theirPower = 0;
INT16 diff = 0; // Loser PWR.LV - Winner PWR.LV INT16 diff = 0; // Loser PWR.LV - Winner PWR.LV
INT16 inc = 0; // Total pt increment INT16 inc = 0; // Total pt increment
@ -226,7 +240,7 @@ void K_UpdatePowerLevels(player_t *player)
continue; continue;
} }
CONS_Printf("Player %d VS Player %d:\n", playerNum, i); CONS_Printf("%s VS %s:\n", player_names[playerNum], player_names[i]);
theirPower = clientpowerlevels[i][powerType]; theirPower = clientpowerlevels[i][powerType];
if (theirPower == 0) if (theirPower == 0)
@ -235,16 +249,10 @@ void K_UpdatePowerLevels(player_t *player)
continue; continue;
} }
CONS_Printf("Player %d's PWR.LV: %d\n", i, theirPower); CONS_Printf("%s's PWR.LV: %d\n", player_names[i], theirPower);
if (gametyperules & GTR_CIRCUIT) theirScore = K_PowerLevelPlacementScore(&players[i]);
{ CONS_Printf("%s's gametype score: %d\n", player_names[i], theirScore);
theirScore = MAXPLAYERS - players[i].position;
}
else
{
theirScore = players[i].score;
}
if (yourScore == theirScore) // Tie -- neither get any points for this match up. if (yourScore == theirScore) // Tie -- neither get any points for this match up.
{ {
@ -258,40 +266,71 @@ void K_UpdatePowerLevels(player_t *player)
{ {
diff = theirPower - yourPower; diff = theirPower - yourPower;
inc += K_CalculatePowerLevelInc(diff); inc += K_CalculatePowerLevelInc(diff);
CONS_Printf("WON! Diff is %d, total increment is %d\n", diff, inc); CONS_Printf("WON! Diff is %d, increment is %d\n", diff, inc);
} }
else // This player lost... else // This player lost...
{ {
diff = yourPower - theirPower; diff = yourPower - theirPower;
inc -= K_CalculatePowerLevelInc(diff); inc -= K_CalculatePowerLevelInc(diff);
CONS_Printf("LOST... Diff is %d, total increment is %d\n", diff, inc); CONS_Printf("LOST... Diff is %d, increment is %d\n", diff, inc);
} }
if (exitBonus == false) if (exitBonus == false)
{ {
CONS_Printf("Reduced (%d / %d = %d) because it's not the end of the race\n", inc, numlaps, inc/numlaps); INT16 prevInc = inc;
inc /= numlaps; inc /= numlaps;
if (inc == 0)
{
if (prevInc > 0)
{
inc = 1;
}
else if (prevInc < 0)
{
inc = -1;
}
}
CONS_Printf("Reduced (%d / %d = %d) because it's not the end of the race\n", prevInc, numlaps, inc);
} }
CONS_Printf("========\n");
if (inc == 0) if (inc == 0)
{ {
CONS_Printf("Total Result: No increment, no change.\n"); CONS_Printf("Total Result: No increment, no change.\n");
continue; continue;
} }
CONS_Printf("Total Result: Increment of %d.\n", inc); CONS_Printf("Total Result:\n");
CONS_Printf("Increment: %d\n", inc);
CONS_Printf("%s current: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
clientPowerAdd[playerNum] += inc; clientPowerAdd[playerNum] += inc;
CONS_Printf("%s final: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
CONS_Printf("%s current: %d\n", player_names[i], clientPowerAdd[i]);
clientPowerAdd[i] -= inc; clientPowerAdd[i] -= inc;
CONS_Printf("%s final: %d\n", player_names[i], clientPowerAdd[i]);
CONS_Printf("========\n");
} }
} }
INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 increment) INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 baseInc)
{ {
INT16 inc = increment; INT16 inc = baseInc;
UINT8 numPlayers = 0; UINT8 numPlayers = 0;
UINT8 i; UINT8 i;
if (yourPower == 0)
{
// Guests don't record power level changes.
return 0;
}
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator) if (!playeringame[i] || players[i].spectator)
@ -315,6 +354,18 @@ INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 increment)
// You trade points in 1v1s, // You trade points in 1v1s,
// but is more lenient in bigger lobbies. // but is more lenient in bigger lobbies.
inc /= max(1, numPlayers-1); inc /= max(1, numPlayers-1);
if (inc == 0)
{
if (baseInc > 0)
{
inc = 1;
}
else if (baseInc < 0)
{
inc = -1;
}
}
} }
} }
@ -336,14 +387,20 @@ void K_CashInPowerLevels(void)
SINT8 powerType = K_UsingPowerLevels(); SINT8 powerType = K_UsingPowerLevels();
UINT8 i; UINT8 i;
CONS_Printf("\n========\n");
CONS_Printf("Cashing in power level changes...\n");
CONS_Printf("========\n");
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (powerType != PWRLV_DISABLED) if (powerType != PWRLV_DISABLED && playeringame[i])
{ {
INT16 inc = K_FinalPowerIncrement(&players[i], clientpowerlevels[i][powerType], clientPowerAdd[i]); INT16 inc = K_FinalPowerIncrement(&players[i], clientpowerlevels[i][powerType], clientPowerAdd[i]);
clientpowerlevels[i][powerType] += inc; clientpowerlevels[i][powerType] += inc;
if (!demo.playback && i == consoleplayer) CONS_Printf("%s: %d -> %d (%d)\n", player_names[i], clientpowerlevels[i][powerType] - inc, clientpowerlevels[i][powerType], inc);
if (!demo.playback && i == consoleplayer && inc != 0)
{ {
vspowerlevel[powerType] = clientpowerlevels[i][powerType]; vspowerlevel[powerType] = clientpowerlevels[i][powerType];
@ -358,6 +415,8 @@ void K_CashInPowerLevels(void)
clientPowerAdd[i] = 0; clientPowerAdd[i] = 0;
} }
CONS_Printf("========\n");
} }
void K_SetPowerLevelScrambles(SINT8 powertype) void K_SetPowerLevelScrambles(SINT8 powertype)
@ -489,8 +548,8 @@ void K_PlayerForfeit(UINT8 playernum, boolean pointloss)
{ {
UINT8 p = 0; UINT8 p = 0;
INT32 powertype = PWRLV_DISABLED; INT32 powertype = PWRLV_DISABLED;
UINT16 yourpower = PWRLVRECORD_DEF; UINT16 yourpower = PWRLVRECORD_MEDIAN;
UINT16 theirpower = PWRLVRECORD_DEF; UINT16 theirpower = PWRLVRECORD_MEDIAN;
INT16 diff = 0; // Loser PWR.LV - Winner PWR.LV INT16 diff = 0; // Loser PWR.LV - Winner PWR.LV
INT16 inc = 0; INT16 inc = 0;
UINT8 lapsLeft = 0; UINT8 lapsLeft = 0;

3
src/k_pwrlv.h
View file

@ -24,7 +24,7 @@ typedef enum
} pwrlv_type_t; } pwrlv_type_t;
#define PWRLVRECORD_START 1000 #define PWRLVRECORD_START 1000
#define PWRLVRECORD_DEF 5000 #define PWRLVRECORD_MEDIAN 5000
#define PWRLVRECORD_MIN 1 #define PWRLVRECORD_MIN 1
#define PWRLVRECORD_MAX 9999 #define PWRLVRECORD_MAX 9999
@ -39,6 +39,7 @@ extern UINT8 spectateGriefed;
SINT8 K_UsingPowerLevels(void); SINT8 K_UsingPowerLevels(void);
void K_ClearClientPowerLevels(void); void K_ClearClientPowerLevels(void);
INT16 K_CalculatePowerLevelInc(INT16 diff); INT16 K_CalculatePowerLevelInc(INT16 diff);
INT16 K_PowerLevelPlacementScore(player_t *player);
INT16 K_CalculatePowerLevelAvg(void); INT16 K_CalculatePowerLevelAvg(void);
void K_UpdatePowerLevels(player_t *player); void K_UpdatePowerLevels(player_t *player);
INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 increment); INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 increment);

8
src/p_spec.c
View file

@ -1968,7 +1968,7 @@ static void K_HandleLapIncrement(player_t *player)
{ {
if (player->laps > 1) if (player->laps > 1)
{ {
// save best lap for record attack // save best lap for record attack
if (modeattacking && player == &players[consoleplayer]) if (modeattacking && player == &players[consoleplayer])
{ {
if (curlap < bestlap || bestlap == 0) if (curlap < bestlap || bestlap == 0)
@ -1979,10 +1979,12 @@ static void K_HandleLapIncrement(player_t *player)
curlap = 0; curlap = 0;
} }
// Update power levels for this lap.
K_UpdatePowerLevels(player);
} }
// Update power levels for this lap.
K_UpdatePowerLevels(player);
player->latestlap = player->laps; player->latestlap = player->laps;
} }