Skip to content

Vote package changes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackcaver wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Vote package changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bombd/Core/SimServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private void UpdateVotePackage()
{
if (_raceSettings == null) return;

_votePackage.Value.StartVote(_raceSettings.Value.CreationId);
_votePackage.Value.StartVote(_raceSettings.Value.CreationId, _players.Count);
_votePackage.Sync();
}

Expand Down
4 changes: 2 additions & 2 deletions Bombd/Core/WebApiManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ public static CoiInfo GetCircleOfInfluence()
return coi;
}

public static List<int> GetRandomTracks(int currentTrackId)
public static List<int> GetRandomTracks(int currentTrackId, int playerCount)
{
string json = MakeRequest($"{BombdConfig.Instance.ApiURL}/api/VotePackage?trackId={currentTrackId}");
string json = MakeRequest($"{BombdConfig.Instance.ApiURL}/api/VotePackage?trackId={currentTrackId}&playerCount={playerCount}");
if (string.IsNullOrEmpty(json)) return Career.Karting.GetVotePackage(currentTrackId);

try
Expand Down
7 changes: 2 additions & 5 deletions Bombd/Types/Network/Objects/VotePackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,15 @@ public void CastVote(int userId, int trackId)
}
}

public void StartVote(int replayCreationId)
public void StartVote(int replayCreationId, int playerCount)
{
_finalizedVotedTrack = -1;
_state = 1;

int trackIndex = 0;
_tracks[trackIndex++].Set(replayCreationId);

List<int> randomTracks =
replayCreationId > NetCreationIdRange.MinOnlineCreationId
? WebApiManager.GetRandomTracks(replayCreationId)
: Career.Karting.GetVotePackage(replayCreationId);
List<int> randomTracks = WebApiManager.GetRandomTracks(replayCreationId, playerCount);

foreach (int track in randomTracks)
_tracks[trackIndex++].Set(track);
Expand Down