diff --git a/Content.Client/Commands/ToggleOutlineCommand.cs b/Content.Client/Commands/ToggleOutlineCommand.cs index a96c9e40a5..ca96762eac 100644 --- a/Content.Client/Commands/ToggleOutlineCommand.cs +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -1,3 +1,4 @@ +using Content.Shared; using Robust.Client.Interfaces.Console; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; @@ -14,10 +15,13 @@ namespace Content.Client.Commands public bool Execute(IDebugConsole console, params string[] args) { - var _configurationManager = IoCManager.Resolve(); - var old = _configurationManager.GetCVar("outline.enabled"); - _configurationManager.SetCVar("outline.enabled", !old); - console.AddLine($"Draw outlines set to: {_configurationManager.GetCVar("outline.enabled")}"); + var configurationManager = IoCManager.Resolve(); + var cvar = CCVars.OutlineEnabled; + var old = configurationManager.GetCVar(cvar); + + configurationManager.SetCVar(cvar, !old); + console.AddLine($"Draw outlines set to: {configurationManager.GetCVar(cvar)}"); + return false; } } diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 4eab611fc2..ffa05119bc 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -101,8 +101,6 @@ namespace Content.Client { IoCManager.Resolve().CreateNewMapEntity(MapId.Nullspace); }; - - _configurationManager.RegisterCVar("outline.enabled", true); } /// diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/ParallaxManager.cs index 441dbcaf08..a58c7710e9 100644 --- a/Content.Client/Parallax/ParallaxManager.cs +++ b/Content.Client/Parallax/ParallaxManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using Content.Client.Interfaces.Parallax; +using Content.Shared; using Nett; using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; @@ -34,12 +35,12 @@ namespace Content.Client.Parallax public async void LoadParallax() { - if (!_configurationManager.GetCVar("parallax.enabled")) + if (!_configurationManager.GetCVar(CCVars.ParallaxEnabled)) { return; } - var debugParallax = _configurationManager.GetCVar("parallax.debug"); + var debugParallax = _configurationManager.GetCVar(CCVars.ParallaxDebug); string contents; TomlTable table; // Load normal config into memory diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index 3e0fa48f65..00e836ffd0 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.Linq; using Content.Client.GameObjects.Components; using Content.Client.Utility; +using Content.Shared; using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.GameObjects; using Robust.Client.Interfaces.Graphics.ClientEye; @@ -71,7 +72,7 @@ namespace Content.Client.State } InteractionOutlineComponent outline; - if(!ConfigurationManager.GetCVar("outline.enabled")) + if(!ConfigurationManager.GetCVar(CCVars.OutlineEnabled)) { if(entityToClick != null && entityToClick.TryGetComponent(out outline)) { diff --git a/Content.Client/State/MainMenu.cs b/Content.Client/State/MainMenu.cs index 0d709c074d..b5f7503f49 100644 --- a/Content.Client/State/MainMenu.cs +++ b/Content.Client/State/MainMenu.cs @@ -8,6 +8,7 @@ using Robust.Client.Interfaces.UserInterface; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.Network; using Robust.Shared.IoC; @@ -111,10 +112,10 @@ namespace Content.Client.State return; } - var configName = _configurationManager.GetCVar("player.name"); + var configName = _configurationManager.GetCVar(CVars.PlayerName); if (_mainMenuControl.UserNameBox.Text != configName) { - _configurationManager.SetCVar("player.name", inputName); + _configurationManager.SetCVar(CVars.PlayerName, inputName); _configurationManager.SaveToFile(); } @@ -248,7 +249,7 @@ namespace Content.Client.State vBox.AddChild(userNameHBox); userNameHBox.AddChild(new Label {Text = "Username:"}); - var currentUserName = _configurationManager.GetCVar("player.name"); + var currentUserName = _configurationManager.GetCVar(CVars.PlayerName); UserNameBox = new LineEdit { Text = currentUserName, PlaceHolder = "Username", diff --git a/Content.Client/UserInterface/OptionsMenu.Graphics.cs b/Content.Client/UserInterface/OptionsMenu.Graphics.cs index 0e9861d358..7642cd3a90 100644 --- a/Content.Client/UserInterface/OptionsMenu.Graphics.cs +++ b/Content.Client/UserInterface/OptionsMenu.Graphics.cs @@ -1,7 +1,9 @@ -using Robust.Client.Graphics; +using Content.Shared; +using Robust.Client.Graphics; using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; using Robust.Shared.Localization; @@ -121,7 +123,7 @@ namespace Content.Client.UserInterface }); ApplyButton.OnPressed += OnApplyButtonPressed; - VSyncCheckBox.Pressed = _cfg.GetCVar("display.vsync"); + VSyncCheckBox.Pressed = _cfg.GetCVar(CVars.DisplayVSync); FullscreenCheckBox.Pressed = ConfigIsFullscreen; LightingPresetOption.SelectId(GetConfigLightingQuality()); _uiScaleOption.SelectId(GetConfigUIScalePreset(ConfigUIScale)); @@ -137,11 +139,11 @@ namespace Content.Client.UserInterface private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args) { - _cfg.SetCVar("display.vsync", VSyncCheckBox.Pressed); + _cfg.SetCVar(CVars.DisplayVSync, VSyncCheckBox.Pressed); SetConfigLightingQuality(LightingPresetOption.SelectedId); - _cfg.SetCVar("display.windowmode", + _cfg.SetCVar(CVars.DisplayWindowMode, (int) (FullscreenCheckBox.Pressed ? WindowMode.Fullscreen : WindowMode.Windowed)); - _cfg.SetCVar("display.uiScale", UIScaleOptions[_uiScaleOption.SelectedId]); + _cfg.SetCVar(CVars.DisplayUIScale, UIScaleOptions[_uiScaleOption.SelectedId]); _cfg.SaveToFile(); UpdateApplyButton(); } @@ -159,7 +161,7 @@ namespace Content.Client.UserInterface private void UpdateApplyButton() { - var isVSyncSame = VSyncCheckBox.Pressed == _cfg.GetCVar("display.vsync"); + var isVSyncSame = VSyncCheckBox.Pressed == _cfg.GetCVar(CVars.DisplayVSync); var isFullscreenSame = FullscreenCheckBox.Pressed == ConfigIsFullscreen; var isLightingQualitySame = LightingPresetOption.SelectedId == GetConfigLightingQuality(); var isUIScaleSame = MathHelper.CloseTo(UIScaleOptions[_uiScaleOption.SelectedId], ConfigUIScale); @@ -167,14 +169,14 @@ namespace Content.Client.UserInterface } private bool ConfigIsFullscreen => - _cfg.GetCVar("display.windowmode") == (int) WindowMode.Fullscreen; + _cfg.GetCVar(CVars.DisplayWindowMode) == (int) WindowMode.Fullscreen; - private float ConfigUIScale => _cfg.GetCVar("display.uiScale"); + private float ConfigUIScale => _cfg.GetCVar(CVars.DisplayUIScale); private int GetConfigLightingQuality() { - var val = _cfg.GetCVar("display.lightmapdivider"); - var soft = _cfg.GetCVar("display.softshadows"); + var val = _cfg.GetCVar(CVars.DisplayLightMapDivider); + var soft = _cfg.GetCVar(CVars.DisplaySoftShadows); if (val >= 8) { return 0; @@ -198,20 +200,20 @@ namespace Content.Client.UserInterface switch (value) { case 0: - _cfg.SetCVar("display.lightmapdivider", 8); - _cfg.SetCVar("display.softshadows", false); + _cfg.SetCVar(CVars.DisplayLightMapDivider, 8); + _cfg.SetCVar(CVars.DisplaySoftShadows, false); break; case 1: - _cfg.SetCVar("display.lightmapdivider", 2); - _cfg.SetCVar("display.softshadows", false); + _cfg.SetCVar(CVars.DisplayLightMapDivider, 2); + _cfg.SetCVar(CVars.DisplaySoftShadows, false); break; case 2: - _cfg.SetCVar("display.lightmapdivider", 2); - _cfg.SetCVar("display.softshadows", true); + _cfg.SetCVar(CVars.DisplayLightMapDivider, 2); + _cfg.SetCVar(CVars.DisplaySoftShadows, true); break; case 3: - _cfg.SetCVar("display.lightmapdivider", 1); - _cfg.SetCVar("display.softshadows", true); + _cfg.SetCVar(CVars.DisplayLightMapDivider, 1); + _cfg.SetCVar(CVars.DisplaySoftShadows, true); break; } } diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs index 83e4d111bb..aa9c2cdc54 100644 --- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; +using Content.Shared; using NUnit.Framework; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.GameObjects; @@ -31,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Commands server.Assert(() => { - configManager.SetCVar("game.lobbyenabled", lobbyEnabled); + configManager.SetCVar(CCVars.GameLobbyEnabled, lobbyEnabled); Assert.That(gameTicker.RunLevel, Is.EqualTo(GameRunLevel.InRound)); diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs index afc4cbd6a9..218e6a85b6 100644 --- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs @@ -38,9 +38,7 @@ namespace Content.IntegrationTests.Tests.Lobby await server.WaitAssertion(() => { - var lobbyCvar = CCVars.GameLobbyEnabled; - serverConfig.SetCVar(lobbyCvar.Name, true); - + serverConfig.SetCVar(CCVars.GameLobbyEnabled, true); serverTicker.RestartRound(); }); diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs index f951020547..cf99ce1086 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.Movement; +using Content.Shared; using Content.Shared.GameObjects.Components.Movement; using JetBrains.Annotations; using Robust.Server.AI; @@ -42,7 +43,6 @@ namespace Content.Server.GameObjects.EntitySystems.AI public override void Initialize() { base.Initialize(); - _configurationManager.RegisterCVar("ai.maxupdates", 64); SubscribeLocalEvent(HandleAiSleep); var processors = _reflectionManager.GetAllChildren(); @@ -58,7 +58,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI /// public override void Update(float frameTime) { - var cvarMaxUpdates = _configurationManager.GetCVar("ai.maxupdates"); + var cvarMaxUpdates = _configurationManager.GetCVar(CCVars.AIMaxUpdates); if (cvarMaxUpdates <= 0) return; @@ -75,7 +75,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI break; case false: _awakeAi.Add(message.Processor); - + if (_awakeAi.Count > cvarMaxUpdates) { Logger.Warning($"AI limit exceeded: {_awakeAi.Count} / {cvarMaxUpdates}"); @@ -101,7 +101,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI toRemove.Add(processor); continue; } - + processor.Update(frameTime); count++; } diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs index e7b0380d1a..e40ce9ce3a 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/AtmosDebugOverlaySystem.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using Content.Server.GameObjects.Components.Atmos; using Content.Server.Atmos; +using Content.Shared; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using JetBrains.Annotations; @@ -47,7 +48,6 @@ namespace Content.Server.GameObjects.EntitySystems.Atmos _atmosphereSystem = Get(); _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; - _configManager.RegisterCVar("net.atmosdbgoverlaytickrate", 3.0f); } public override void Shutdown() @@ -89,7 +89,7 @@ namespace Content.Server.GameObjects.EntitySystems.Atmos public override void Update(float frameTime) { AccumulatedFrameTime += frameTime; - _updateCooldown = 1 / _configManager.GetCVar("net.atmosdbgoverlaytickrate"); + _updateCooldown = 1 / _configManager.GetCVar(CCVars.NetAtmosDebugOverlayTickRate); if (AccumulatedFrameTime < _updateCooldown) { diff --git a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs index 461c45cd47..c26bbc6320 100644 --- a/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Atmos/GasTileOverlaySystem.cs @@ -4,12 +4,14 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; using Content.Server.GameObjects.Components.Atmos; +using Content.Shared; using Content.Shared.Atmos; using Content.Shared.GameObjects.EntitySystems.Atmos; using Content.Shared.GameTicking; using JetBrains.Annotations; using Robust.Server.Interfaces.Player; using Robust.Server.Player; +using Robust.Shared; using Robust.Shared.Enums; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.GameObjects; @@ -65,7 +67,6 @@ namespace Content.Server.GameObjects.EntitySystems.Atmos _atmosphereSystem = Get(); _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; _mapManager.OnGridRemoved += OnGridRemoved; - _configManager.RegisterCVar("net.gasoverlaytickrate", 3.0f); } public override void Shutdown() @@ -228,14 +229,14 @@ namespace Content.Server.GameObjects.EntitySystems.Atmos public override void Update(float frameTime) { AccumulatedFrameTime += frameTime; - _updateCooldown = 1 / _configManager.GetCVar("net.gasoverlaytickrate"); + _updateCooldown = 1 / _configManager.GetCVar(CCVars.NetGasOverlayTickRate); if (AccumulatedFrameTime < _updateCooldown) { return; } - _updateRange = _configManager.GetCVar("net.maxupdaterange") + RangeOffset; + _updateRange = _configManager.GetCVar(CVars.NetMaxUpdateRange) + RangeOffset; // TODO: So in the worst case scenario we still have to send a LOT of tile data per tick if there's a fire. // If we go with say 15 tile radius then we have up to 900 tiles to update per tick. diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index 9021cd4fef..3b497d8938 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -9,6 +9,7 @@ using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs.Roles.Suspicion; using Content.Server.Players; +using Content.Shared; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Roles; @@ -44,20 +45,12 @@ namespace Content.Server.GameTicking.GamePresets private static string TraitorID = "SuspicionTraitor"; private static string InnocentID = "SuspicionInnocent"; - public static void RegisterCVars(IConfigurationManager cfg) - { - cfg.RegisterCVar("game.suspicion_min_players", 5); - cfg.RegisterCVar("game.suspicion_min_traitors", 2); - cfg.RegisterCVar("game.suspicion_players_per_traitor", 5); - cfg.RegisterCVar("game.suspicion_starting_balance", 20); - } - public override bool Start(IReadOnlyList readyPlayers, bool force = false) { - MinPlayers = _cfg.GetCVar("game.suspicion_min_players"); - MinTraitors = _cfg.GetCVar("game.suspicion_min_traitors"); - PlayersPerTraitor = _cfg.GetCVar("game.suspicion_players_per_traitor"); - TraitorStartingBalance = _cfg.GetCVar("game.suspicion_starting_balance"); + MinPlayers = _cfg.GetCVar(CCVars.GameSuspicionMinPlayers); + MinTraitors = _cfg.GetCVar(CCVars.GameSuspicionMinTraitors); + PlayersPerTraitor = _cfg.GetCVar(CCVars.GameSuspicionPlayersPerTraitor); + TraitorStartingBalance = _cfg.GetCVar(CCVars.GameSuspicionStartingBalance); if (!force && readyPlayers.Count < MinPlayers) { diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs index 03874a6d99..97d0dfb0a8 100644 --- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs @@ -2,6 +2,7 @@ using System.Threading; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; +using Content.Shared; using Content.Shared.GameObjects.Components.Damage; using Robust.Server.Interfaces.Player; using Robust.Server.Player; @@ -56,7 +57,7 @@ namespace Content.Server.GameTicking.GameRules { _checkTimerCancel = null; - if (!_cfg.GetCVar("game.enablewin")) + if (!_cfg.GetCVar(CCVars.GameLobbyEnableWin)) return; IPlayerSession winner = null; diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs index a6c33264fc..8f77126c78 100644 --- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs @@ -6,6 +6,7 @@ using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs.Roles.Suspicion; using Content.Server.Players; +using Content.Shared; using Content.Shared.GameObjects.Components.Damage; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.Player; @@ -58,7 +59,7 @@ namespace Content.Server.GameTicking.GameRules private void _checkWinConditions() { - if (!_cfg.GetCVar("game.enablewin")) + if (!_cfg.GetCVar(CCVars.GameLobbyEnableWin)) return; var traitorsAlive = 0; diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index b6d396e95e..9e2a23b00b 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -88,7 +88,7 @@ namespace Content.Server.GameTicking [ViewVariables] private bool DisallowLateJoin { get; set; } = false; - [ViewVariables] private bool LobbyEnabled => _configurationManager.GetCVar("game.lobbyenabled"); + [ViewVariables] private bool LobbyEnabled => _configurationManager.GetCVar(CCVars.GameLobbyEnabled); [ViewVariables] private bool _updateOnRoundEnd; private CancellationTokenSource _updateShutdownCts; @@ -119,7 +119,7 @@ namespace Content.Server.GameTicking public event Action OnRuleAdded; private TimeSpan LobbyDuration => - TimeSpan.FromSeconds(_configurationManager.GetCVar("game.lobbyduration")); + TimeSpan.FromSeconds(_configurationManager.GetCVar(CCVars.GameLobbyDuration)); public override void Initialize() { @@ -127,8 +127,6 @@ namespace Content.Server.GameTicking DebugTools.Assert(!_initialized); - PresetSuspicion.RegisterCVars(_configurationManager); - _netManager.RegisterNetMessage(nameof(MsgTickerJoinLobby)); _netManager.RegisterNetMessage(nameof(MsgTickerJoinGame)); _netManager.RegisterNetMessage(nameof(MsgTickerLobbyStatus)); @@ -286,9 +284,9 @@ namespace Content.Server.GameTicking if (!preset.Start(assignedJobs.Keys.ToList(), force)) { - if (_configurationManager.GetCVar("game.fallbackenabled")) + if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled)) { - SetStartPreset(_configurationManager.GetCVar("game.fallbackpreset")); + SetStartPreset(_configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset)); var newPreset = MakeGamePreset(profiles); _chatManager.DispatchServerAnnouncement( $"Failed to start {preset.ModeTitle} mode! Defaulting to {newPreset.ModeTitle}..."); diff --git a/Content.Server/MoMMILink.cs b/Content.Server/MoMMILink.cs index 0ea3befd25..692dcd59c5 100644 --- a/Content.Server/MoMMILink.cs +++ b/Content.Server/MoMMILink.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; +using Content.Shared; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using Robust.Server.Interfaces.ServerStatus; @@ -27,9 +28,6 @@ namespace Content.Server void IPostInjectInit.PostInject() { - _configurationManager.RegisterCVar("status.mommiurl", null); - _configurationManager.RegisterCVar("status.mommipassword", null); - _statusHost.AddHandler(_handleChatPost); } @@ -46,8 +44,8 @@ namespace Content.Server private async Task _sendMessageInternal(string type, object messageObject) { - var url = _configurationManager.GetCVar("status.mommiurl"); - var password = _configurationManager.GetCVar("status.mommipassword"); + var url = _configurationManager.GetCVar(CCVars.StatusMoMMIUrl); + var password = _configurationManager.GetCVar(CCVars.StatusMoMMIPassword); if (string.IsNullOrWhiteSpace(url)) { return; @@ -83,7 +81,7 @@ namespace Content.Server return false; } - var password = _configurationManager.GetCVar("status.mommipassword"); + var password = _configurationManager.GetCVar(CCVars.StatusMoMMIPassword); OOCPostMessage message = null; try diff --git a/Content.Shared/CCVars.cs b/Content.Shared/CCVars.cs index 94c17dc378..ae6fde26bf 100644 --- a/Content.Shared/CCVars.cs +++ b/Content.Shared/CCVars.cs @@ -7,6 +7,21 @@ namespace Content.Shared [CVarDefs] public sealed class CCVars : CVars { + /* + * Status + */ + + public static readonly CVarDef StatusMoMMIUrl = + CVarDef.Create("status.mommiurl", null); + + public static readonly CVarDef StatusMoMMIPassword = + CVarDef.Create("status.mommipassword", null); + + + /* + * Game + */ + public static readonly CVarDef EventsEnabled = CVarDef.Create("events.enabled", false, CVar.ARCHIVE | CVar.SERVERONLY); @@ -37,6 +52,21 @@ namespace Content.Shared public static readonly CVarDef GamePersistGuests = CVarDef.Create("game.persistguests", true, CVar.ARCHIVE | CVar.SERVERONLY); + public static readonly CVarDef GameSuspicionMinPlayers = + CVarDef.Create("game.suspicion_min_players", 5); + + public static readonly CVarDef GameSuspicionMinTraitors = + CVarDef.Create("game.suspicion_min_traitors", 2); + + public static readonly CVarDef GameSuspicionPlayersPerTraitor = + CVarDef.Create("game.suspicion_players_per_traitor", 5); + + public static readonly CVarDef GameSuspicionStartingBalance = + CVarDef.Create("game.suspicion_starting_balance", 20); + + public static readonly CVarDef GameDiagonalMovement = + CVarDef.Create("game.diagonalmovement", true, CVar.ARCHIVE); + /* * Database stuff @@ -62,5 +92,43 @@ namespace Content.Shared public static readonly CVarDef DatabasePgPassword = CVarDef.Create("database.pg_password", "", CVar.SERVERONLY); + + + /* + * Outline + */ + + public static readonly CVarDef OutlineEnabled = + CVarDef.Create("outline.enabled", true, CVar.CLIENTONLY); + + + /* + * Parallax + */ + + public static readonly CVarDef ParallaxEnabled = + CVarDef.Create("parallax.enabled", true); + + public static readonly CVarDef ParallaxDebug = + CVarDef.Create("parallax.debug", true); + + + /* + * AI + */ + + public static readonly CVarDef AIMaxUpdates = + CVarDef.Create("ai.maxupdates", 64); + + + /* + * Net + */ + + public static readonly CVarDef NetAtmosDebugOverlayTickRate = + CVarDef.Create("net.atmosdbgoverlaytickrate", 3.0f); + + public static readonly CVarDef NetGasOverlayTickRate = + CVarDef.Create("net.gasoverlaytickrate", 3.0f); } } diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs index 14554be489..a1d2d659e8 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs @@ -139,7 +139,7 @@ namespace Content.Shared.GameObjects.Components.Movement /// Whether or not the player can move diagonally. /// [ViewVariables] - public bool DiagonalMovementEnabled => _configurationManager.GetCVar("game.diagonalmovement"); + public bool DiagonalMovementEnabled => _configurationManager.GetCVar(CCVars.GameDiagonalMovement); /// public override void OnAdd() diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs index c534d53ef4..a1cb02fe6a 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs @@ -41,8 +41,6 @@ namespace Content.Shared.GameObjects.EntitySystems .Bind(EngineKeyFunctions.MoveDown, moveDownCmdHandler) .Bind(EngineKeyFunctions.Walk, new WalkInputCmdHandler()) .Register(); - - _configurationManager.RegisterCVar("game.diagonalmovement", true, CVar.ARCHIVE); } ///