From 29bc6bf55282ae1fa9361dbdb5dade3ebac075a5 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 21 May 2022 20:55:19 -0700 Subject: [PATCH] Allow game presets to have min/max players (#8327) Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> --- Content.Server/GameTicking/Presets/GamePresetPrototype.cs | 6 ++++++ Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs index ac6db03dde..dbedc25b3c 100644 --- a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs +++ b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs @@ -25,6 +25,12 @@ namespace Content.Server.GameTicking.Presets [DataField("showInVote")] public bool ShowInVote { get; } = false; + [DataField("minPlayers")] + public int? MinPlayers { get; } = null; + + [DataField("maxPlayers")] + public int? MaxPlayers { get; } = null; + [DataField("rules", customTypeSerializer:typeof(PrototypeIdListSerializer))] public IReadOnlyList Rules { get; } = Array.Empty(); } diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index a320b6c02b..569b2105e5 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -110,6 +110,12 @@ namespace Content.Server.Voting.Managers if(!preset.ShowInVote) continue; + if(_playerManager.PlayerCount < (preset.MinPlayers ?? int.MinValue)) + continue; + + if(_playerManager.PlayerCount > (preset.MaxPlayers ?? int.MaxValue)) + continue; + presets[preset.ID] = preset.ModeTitle; }