tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Secret! (#8276)

Browse Source 
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
This commit is contained in:
metalgearsloth
2022-05-19 14:44:24 +10:00
committed by GitHub
parent a6a25e30e5
commit 8d6a3ecea7
12 changed files with 133 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/GameTicking/GameTicker.GamePreset.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.GameTicking.Presets;
using Content.Server.GameTicking.Rules;
using Content.Server.Ghost.Components;
@@ -14,7 +15,7 @@ namespace Content.Server.GameTicking
{
public const float PresetFailedCooldownIncrease = 30f;
private GamePresetPrototype? _preset;
public GamePresetPrototype? Preset { get; private set; }
private bool StartPreset(IPlayerSession[] origReadyPlayers, bool force)
{
@@ -24,7 +25,7 @@ namespace Content.Server.GameTicking
if (!startAttempt.Cancelled)
return true;
var presetTitle = _preset != null ? Loc.GetString(_preset.ModeTitle) : string.Empty;
var presetTitle = Preset != null ? Loc.GetString(Preset.ModeTitle) : string.Empty;
void FailedPresetRestart()
{
@@ -36,7 +37,7 @@ namespace Content.Server.GameTicking
if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled))
{
var oldPreset = _preset;
var oldPreset = Preset;
ClearGameRules();
SetGamePreset(_configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset));
AddGamePresetRules();
@@ -48,7 +49,7 @@ namespace Content.Server.GameTicking
_chatManager.DispatchServerAnnouncement(
Loc.GetString("game-ticker-start-round-cannot-start-game-mode-fallback",
("failedGameMode", presetTitle),
("fallbackMode", Loc.GetString(_preset!.ModeTitle))));
("fallbackMode", Loc.GetString(Preset!.ModeTitle))));
if (startAttempt.Cancelled)
{
@@ -78,7 +79,7 @@ namespace Content.Server.GameTicking
if (DummyTicker)
return;
_preset = preset;
Preset = preset;
UpdateInfoText();
if (force)
@@ -120,10 +121,10 @@ namespace Content.Server.GameTicking
private bool AddGamePresetRules()
{
if (DummyTicker || _preset == null)
if (DummyTicker || Preset == null)
return false;
foreach (var rule in _preset.Rules)
foreach (var rule in Preset.Rules)
{
if (!_prototypeManager.TryIndex(rule, out GameRulePrototype? ruleProto))
continue;
@@ -136,7 +137,8 @@ namespace Content.Server.GameTicking
private void StartGamePresetRules()
{
foreach (var rule in _addedGameRules)
// May be touched by the preset during init.
foreach (var rule in _addedGameRules.ToArray())
{
StartGameRule(rule);
}