From: Rainfey Date: Thu, 29 Feb 2024 06:25:10 +0000 (+0000) Subject: Refactor antag rule code (#23445) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4e6c59cfe51211064d79a727cc2d37c2a2f55a2c;p=space-station-14.git Refactor antag rule code (#23445) * Initial Pass, Rev, Thief * Zombie initial pass * Rebase, Traitor * Nukeops, More overloads * Revert RevolutionaryRuleComponent * Use TryRoundStartAttempt, Rewrite nukie spawning * Comments, Add task scheduler to GameRuleSystem * Zombie initial testing done * Sort methods, rework GameRuleTask * Add CCVar, Initial testing continues * Might as well get rid of the obsolete logging * Oops, i dont know how to log apparently * Suggested formatting fixes * Suggested changes * Fix merge issues * Minor optimisation * Allowed thief to choose other antags * Review changes * Spawn items on floor first, then inserting * minor tweaks * Shift as much as possible to ProtoId<> * Remove unneeded * Add exclusive antag attribute * Fix merge issues * Minor formatting fix * Convert to struct * Cleanup * Review cleanup (need to test a lot) * Some fixes, (mostly) tested * oop * Pass tests (for real) --------- Co-authored-by: Rainfall Co-authored-by: AJCM --- diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs index 20103a9743..ec055b3240 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Chat; using Content.Shared.NukeOps; using JetBrains.Annotations; using Robust.Shared.Configuration; +using Robust.Shared.Timing; namespace Content.Client.NukeOps; @@ -10,6 +11,8 @@ namespace Content.Client.NukeOps; public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ILocalizationManager _localizationManager = default!; [ViewVariables] private WarDeclaratorWindow? _window; @@ -20,7 +23,7 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new WarDeclaratorWindow(); + _window = new WarDeclaratorWindow(_gameTiming, _localizationManager); if (State != null) UpdateState(State); @@ -42,7 +45,8 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface protected override void Dispose(bool disposing) { base.Dispose(disposing); - if (disposing) _window?.Dispose(); + if (disposing) + _window?.Dispose(); } private void OnWarDeclaratorActivated(string message) diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml b/Content.Client/NukeOps/WarDeclaratorWindow.xaml index f90ed865a0..43381158a2 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml @@ -1,4 +1,5 @@ - @@ -7,12 +8,16 @@ MinHeight="200" Access="Public" />