beu/TM2020-Gamemodes
1
0
Fork 0
Code Issues 3 Pull Requests Releases Activity

Compare commits

base: beu:a11e708c4db851e3eb5822cb381a0d55ae0c0907
Branches Tags
beu:master
...
compare: beu:a3f042e7f781ee8af3d53794ee6fdff31656dbb8
Branches Tags
beu:master

2 Commits
a11e708c4d ... a3f042e7f7

Author SHA1 Message Date
beu
a3f042e7f7 fix possible live ranking crash 2024-08-25 18:42:23 +02:00
beu
fba93075b0 fix sorting of the Scorestable during the round 2024-08-25 18:42:05 +02:00
1 changed files with 22 additions and 18 deletions
Show Stats Expand all files Collapse all files

40
TM_MultiLivesKnockout.Script.txt
View File

@ -488,7 +488,6 @@ if (Round_ForceEndRound || Round_SkipPauseRound) {
Match_RegistrationIsOpen = False; Match_RegistrationIsOpen = False;
// Eliminate last players // Eliminate last players
Race::SortScores(Race::C_Sort_PrevRaceTime);
declare Integer ParticipantsNb = GetParticipantsNb(); declare Integer ParticipantsNb = GetParticipantsNb();
declare Integer AliveScoresNb = GetAliveScoresNb(); declare Integer AliveScoresNb = GetAliveScoresNb();
declare Integer LossOfLifeNb = GetLossOfLifeNb(Match_CurrentRoundNb, AliveScoresNb); declare Integer LossOfLifeNb = GetLossOfLifeNb(Match_CurrentRoundNb, AliveScoresNb);
@ -842,7 +841,6 @@ Text GetScoreRemainingLivesText(CSmScore _Score) {
Void UpdateCustomRanking(Boolean _DisplayTimes) { Void UpdateCustomRanking(Boolean _DisplayTimes) {
declare Text[] AccountIdsToDisplay = []; declare Text[] AccountIdsToDisplay = [];
declare Text[][Text] CustomPoints = []; declare Text[][Text] CustomPoints = [];
declare Integer[Text] CustomTimes = [];
declare Integer ParticipantsNb = GetParticipantsNb(); declare Integer ParticipantsNb = GetParticipantsNb();
declare Integer AliveScoresNb = GetAliveScoresNb(); declare Integer AliveScoresNb = GetAliveScoresNb();
@ -853,11 +851,11 @@ Void UpdateCustomRanking(Boolean _DisplayTimes) {
if (!ScoreIsRegistered(Score)) continue; if (!ScoreIsRegistered(Score)) continue;
AccountIdsToDisplay.add(Score.User.WebServicesUserId); AccountIdsToDisplay.add(Score.User.WebServicesUserId);
if (!ScoreIsAlive(Score)) continue; if (!ScoreIsAlive(Score)) continue;
Scores::SetPlayerMatchPoints(Score, Scores.count + ParticipantsNb - Index); if (_DisplayTimes) {
if (_DisplayTimes && Score.PrevRaceTimes.count == 0) { Scores::SetPlayerMatchPoints(Score, ParticipantsNb + ParticipantsNb - Index);
CustomTimes[Score.User.WebServicesUserId] = 0; //@ prev race is updated automatically at the moment (22/10/20) so we need to use this } else {
} else if (!_DisplayTimes) { Scores::SetPlayerMatchPoints(Score, ParticipantsNb + GetScoreRemainingLives(Score));
CustomPoints[Score.User.WebServicesUserId] = [GetScoreRemainingLivesText(Score)]; CustomPoints[Score.User.WebServicesUserId] = [GetScoreRemainingLivesText(Score)];
} }
if (AliveScoresNb == 1 && ParticipantsNb > 1) { if (AliveScoresNb == 1 && ParticipantsNb > 1) {
@ -869,7 +867,9 @@ Void UpdateCustomRanking(Boolean _DisplayTimes) {
declare Text[Text] CustomRanks = []; declare Text[Text] CustomRanks = [];
Race::SortScores(Race::C_Sort_TotalPoints); Race::SortScores(Race::C_Sort_TotalPoints);
foreach (Score in Scores) { foreach (Score in Scores) {
if (ScoreIsAlive(Score)) { if (AliveScoresNb == 1 && ScoreIsAlive(Score)) {
CustomRanks[Score.User.WebServicesUserId] = "1";
} else if (ScoreIsAlive(Score)) {
CustomRanks[Score.User.WebServicesUserId] = "-"; CustomRanks[Score.User.WebServicesUserId] = "-";
} else if (ScoreIsRegistered(Score)) { } else if (ScoreIsRegistered(Score)) {
CustomRanks[Score.User.WebServicesUserId] = ""^Rank; CustomRanks[Score.User.WebServicesUserId] = ""^Rank;
@ -881,7 +881,6 @@ Void UpdateCustomRanking(Boolean _DisplayTimes) {
UIModules_ScoresTable::SetCustomRanks(CustomRanks); UIModules_ScoresTable::SetCustomRanks(CustomRanks);
UIModules_ScoresTable::DisplayOnly(AccountIdsToDisplay); // Display only registered players UIModules_ScoresTable::DisplayOnly(AccountIdsToDisplay); // Display only registered players
UIModules_ScoresTable::SetCustomPoints(CustomPoints); UIModules_ScoresTable::SetCustomPoints(CustomPoints);
UIModules_ScoresTable::SetCustomTimes(CustomTimes);
} }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
@ -1332,15 +1331,17 @@ Void UpdateRanking() {
} else { } else {
declare Ident PlayerId = ScoreIdToPlayerId.get(Score.Id, NullId); declare Ident PlayerId = ScoreIdToPlayerId.get(Score.Id, NullId);
if (PlayerId != NullId) { if (PlayerId != NullId) {
declare CSmPlayer Player <=> Players[PlayerId]; declare CSmPlayer Player <=> Players.get(PlayerId, Null);
PlayerState.CPNb = Player.RaceWaypointTimes.count; if (Player != Null) {
PlayerState.IsNotPlaying = (Player.SpawnStatus == CSmPlayer::ESpawnStatus::NotSpawned); PlayerState.CPNb = Player.RaceWaypointTimes.count;
PlayerState.Finished = (Score.PrevRaceTimes.count != 0); PlayerState.IsNotPlaying = (Player.SpawnStatus == CSmPlayer::ESpawnStatus::NotSpawned);
PlayerState.Finished = (Score.PrevRaceTimes.count != 0);
if (PlayerState.CPNb > 0) {
PlayerState.LastCPTime = Player.RaceWaypointTimes[-1]; if (PlayerState.CPNb > 0) {
PlayerState.LastCPTime = Player.RaceWaypointTimes[-1];
}
if (GlobalLastCPTime < PlayerState.LastCPTime) GlobalLastCPTime = PlayerState.LastCPTime;
} }
if (GlobalLastCPTime < PlayerState.LastCPTime) GlobalLastCPTime = PlayerState.LastCPTime;
} }
} }
@ -1393,7 +1394,10 @@ Void UpdateRanking() {
PlayerState.InDanger = (Rank >= LostOfLifeRank); PlayerState.InDanger = (Rank >= LostOfLifeRank);
if (FirstPlayer == Null) { if (FirstPlayer == Null) {
FirstPlayer <=> Players[ScoreIdToPlayerId.get(PlayerState.ScoreId, NullId)]; declare Ident FirstPlayerId = ScoreIdToPlayerId.get(PlayerState.ScoreId, NullId);
if (FirstPlayerId != NullId) {
FirstPlayer <=> Players[FirstPlayerId];
}
} }
if (FirstPlayer != Null) { if (FirstPlayer != Null) {