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

Removes score from,gp grading

Browse source 
fixes podium warp data generation
more minor renames
This commit is contained in:
Ashnal 2025-05-17 18:04:12 -04:00
parent 3d11c142cc
commit d65fe8f6bf
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/k_podium.cpp
View file

@ -180,7 +180,7 @@ void podiumData_s::Init(void)
default: default:
{ {
lvl->totalExp = TARGETEXP; lvl->totalExp = TARGETEXP;
texp += lvl->totalExp; texp += lvl->totalExp * rank.numPlayers;
break; break;
} }
} }
@ -199,7 +199,7 @@ void podiumData_s::Init(void)
rgs += dta->rings; rgs += dta->rings;
dta->exp = M_RandomRange(MINEXP, MAXEXP); dta->exp = M_RandomRange(MINEXP, MAXEXP);
pexp = std::max(pexp, dta->exp); pexp += dta->exp;
} }
if (lvl->event == GPEVENT_BONUS) if (lvl->event == GPEVENT_BONUS)
@ -510,22 +510,22 @@ void podiumData_s::Draw(void)
.font(srb2::Draw::Font::kZVote) .font(srb2::Draw::Font::kZVote)
.text(va("%c%d", (rank.scorePosition > 0 ? '+' : ' '), rank.scorePosition)); .text(va("%c%d", (rank.scorePosition > 0 ? '+' : ' '), rank.scorePosition));
drawer_winner // drawer_winner
.xy(64, 19) // .xy(64, 19)
.patch("K_POINT4"); // .patch("K_POINT4");
drawer_winner // drawer_winner
.xy(88, 21) // .xy(88, 21)
.align(srb2::Draw::Align::kLeft) // .align(srb2::Draw::Align::kLeft)
.font(srb2::Draw::Font::kPing) // .font(srb2::Draw::Font::kPing)
.colormap(TC_RAINBOW, SKINCOLOR_GOLD) // .colormap(TC_RAINBOW, SKINCOLOR_GOLD)
.text(va("%d", rank.winPoints)); // .text(va("%d", rank.winPoints));
drawer_winner // drawer_winner
.xy(75, 31) // .xy(75, 31)
.align(srb2::Draw::Align::kCenter) // .align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kZVote) // .font(srb2::Draw::Font::kZVote)
.text(va("%c%d", (rank.scoreGPPoints > 0 ? '+' : ' '), rank.scoreGPPoints)); // .text(va("%c%d", (rank.scoreGPPoints > 0 ? '+' : ' '), rank.scoreGPPoints));
srb2::Draw drawer_trophy = drawer.xy(272, 10); srb2::Draw drawer_trophy = drawer.xy(272, 10);

7
src/k_rank.cpp
View file

@ -332,7 +332,6 @@ void gpRank_t::Init(void)
const INT32 cupLevelNum = grandprixinfo.cup->cachedlevels[i]; const INT32 cupLevelNum = grandprixinfo.cup->cachedlevels[i];
if (cupLevelNum < nummapheaders && mapheaderinfo[cupLevelNum] != NULL) if (cupLevelNum < nummapheaders && mapheaderinfo[cupLevelNum] != NULL)
{ {
//laps += K_RaceLapCount(cupLevelNum);
exp += TARGETEXP; exp += TARGETEXP;
} }
} }
@ -582,10 +581,10 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData)
rankData->scoreContinues = 0; rankData->scoreContinues = 0;
rankData->scoreTotal = 0; rankData->scoreTotal = 0;
const INT32 expWeight = (rankData->totalExp > 0) ? RANK_WEIGHT_LAPS : 0; const INT32 expWeight = (rankData->totalExp > 0) ? RANK_WEIGHT_EXP : 0;
const INT32 prisonsWeight = (rankData->totalPrisons > 0) ? RANK_WEIGHT_PRISONS : 0; const INT32 prisonsWeight = (rankData->totalPrisons > 0) ? RANK_WEIGHT_PRISONS : 0;
const INT32 total = RANK_WEIGHT_POSITION + RANK_WEIGHT_SCORE + expWeight + prisonsWeight + RANK_WEIGHT_RINGS; const INT32 total = RANK_WEIGHT_POSITION + expWeight + prisonsWeight + RANK_WEIGHT_RINGS;
const INT32 continuesPenalty = total / RANK_CONTINUE_PENALTY_DIV; const INT32 continuesPenalty = total / RANK_CONTINUE_PENALTY_DIV;
if (rankData->position > 0) if (rankData->position > 0)
@ -619,7 +618,7 @@ gp_rank_e K_CalculateGPGrade(gpRank_t *rankData)
rankData->scoreTotal = rankData->scoreTotal =
rankData->scorePosition + rankData->scorePosition +
rankData->scoreGPPoints + // rankData->scoreGPPoints +
rankData->scoreExp + rankData->scoreExp +
rankData->scorePrisons + rankData->scorePrisons +
rankData->scoreRings + rankData->scoreRings +

2
src/k_rank.h
View file

@ -91,7 +91,7 @@ extern "C" {
#define RANK_WEIGHT_POSITION (150) #define RANK_WEIGHT_POSITION (150)
#define RANK_WEIGHT_SCORE (100) #define RANK_WEIGHT_SCORE (100)
#define RANK_WEIGHT_LAPS (100) #define RANK_WEIGHT_EXP (100)
#define RANK_WEIGHT_PRISONS (100) #define RANK_WEIGHT_PRISONS (100)
#define RANK_WEIGHT_RINGS (50) #define RANK_WEIGHT_RINGS (50)