Endrbranch2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,43 +1,11 @@
-<!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
-<!-- The text between the arrows are comments - they will not be visible on your PR. -->
 
-## About the PR
-<!-- What did you change in this PR? -->
+## О чем PR
 
-## Why / Balance
-<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
+## Почему
 
-## Technical details
-<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
+## Технические детали
 
-## Media
-<!-- 
-PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
-Small fixes/refactors are exempt.
-Any media may be used in SS14 progress reports, with clear credit given.
+## Медиа
 
-If you're unsure whether your PR will require media, ask a maintainer.
-
-Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
--->
-
-- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
-
-## Breaking changes
-<!--
-List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes.
--->
-
-**Changelog**
-<!--
-Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
--->
-
-<!--
-Make sure to take this Changelog template out of the comment block in order for it to show up.
-:cl:
-- add: Added fun!
-- remove: Removed fun!
-- tweak: Changed fun!
-- fix: Fixed fun!
--->
+- [ ] Я добавил скриншот/видео, показывающее изменения в игре **или** PR не нуждается в показе
+- [ ] Я проверил изменения на предмет багов

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "dotnet.preferCSharpExtension": true
 }

Content.Client/Credits/CreditsWindow.xaml.cs

@@ -3,6 +3,7 @@
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
+using Content.Shared.Patron;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Credits;
 using Robust.Client.ResourceManagement;
@@ -27,18 +28,15 @@ public sealed partial class CreditsWindow : DefaultWindow
         [Dependency] private readonly IResourceManager _resourceManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-        private static readonly Dictionary<string, int> PatronTierPriority = new()
-        {
-            ["Central Commander"] = 1,
-            ["Captain"] = 2,
-            ["Assistant"] = 3
-        };
+        private PatronManager _patronManager = new PatronManager(); // Delta-V
 
         public CreditsWindow()
         {
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
+            _patronManager.Load(_resourceManager); // Delta-V
+
             TabContainer.SetTabTitle(Ss14ContributorsTab, Loc.GetString("credits-window-ss14contributorslist-tab"));
             TabContainer.SetTabTitle(PatronsTab, Loc.GetString("credits-window-patrons-tab"));
             TabContainer.SetTabTitle(LicensesTab, Loc.GetString("credits-window-licenses-tab"));
@@ -65,7 +63,7 @@ private void PopulateLicenses(BoxContainer licensesContainer)
 
         private void PopulatePatrons(BoxContainer patronsContainer)
         {
-            var patrons = LoadPatrons();
+            var patrons = _patronManager.Patrons!;
 
             // Do not show "become a patron" button on Steam builds
             // since Patreon violates Valve's rules about alternative storefronts.
@@ -84,15 +82,15 @@ private void PopulatePatrons(BoxContainer patronsContainer)
             }
 
             var first = true;
-            foreach (var tier in patrons.GroupBy(p => p.Tier).OrderBy(p => PatronTierPriority[p.Key]))
+            foreach (var tier in patrons.GroupBy(p => p.Tier).OrderBy(p => p.Key.Priority))
             {
                 if (!first)
                 {
                     patronsContainer.AddChild(new Control {MinSize = new Vector2(0, 10)});
                 }
 
                 first = false;
-                patronsContainer.AddChild(new Label {StyleClasses = {StyleBase.StyleClassLabelHeading}, Text = $"{tier.Key}"});
+                patronsContainer.AddChild(new Label {StyleClasses = {StyleBase.StyleClassLabelHeading}, Text = $"{tier.Key.Name}"});
 
                 var msg = string.Join(", ", tier.OrderBy(p => p.Name).Select(p => p.Name));
 
@@ -103,16 +101,6 @@ private void PopulatePatrons(BoxContainer patronsContainer)
             }
         }
 
-        private IEnumerable<PatronEntry> LoadPatrons()
-        {
-            var yamlStream = _resourceManager.ContentFileReadYaml(new ("/Credits/Patrons.yml"));
-            var sequence = (YamlSequenceNode) yamlStream.Documents[0].RootNode;
-
-            return sequence
-                .Cast<YamlMappingNode>()
-                .Select(m => new PatronEntry(m["Name"].AsString(), m["Tier"].AsString()));
-        }
-
         private void PopulateContributors(BoxContainer ss14ContributorsContainer)
         {
             Button contributeButton;
@@ -169,16 +157,5 @@ void AddSection(string title, string path, bool markup = false)
                 contributeButton.Visible = false;
         }
 
-        private sealed class PatronEntry
-        {
-            public string Name { get; }
-            public string Tier { get; }
-
-            public PatronEntry(string name, string tier)
-            {
-                Name = name;
-                Tier = tier;
-            }
-        }
     }
 }

Content.Client/Entry/EntryPoint.cs

@@ -120,6 +120,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
             _prototypeManager.RegisterIgnore("candyFlavor"); // Delta-V
+            _prototypeManager.RegisterIgnore("stationGoal");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();

Content.PatreonParser/Program.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Content.PatreonParser;
@@ -7,7 +7,7 @@
 using static System.Environment;
 
 var repository = new DirectoryInfo(Directory.GetCurrentDirectory()).Parent!.Parent!.Parent!.Parent!;
-var patronsPath = Path.Combine(repository.FullName, "Resources/Credits/Patrons.yml");
+var patronsPath = Path.Combine(repository.FullName, "Resources/Patrons.yml");
 if (!File.Exists(patronsPath))
 {
     Console.WriteLine($"File {patronsPath} not found.");

Content.Server/Chat/Managers/ChatManager.cs

@@ -11,8 +11,10 @@
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Mind;
+using Content.Shared.Patron;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
+using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Replays;
@@ -45,6 +47,7 @@ internal sealed partial class ChatManager : IChatManager
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IResourceManager _resourceManager = default!; // Delta-V
 
         /// <summary>
         /// The maximum length a player-sent message can be sent
@@ -55,6 +58,7 @@ internal sealed partial class ChatManager : IChatManager
         private bool _adminOocEnabled = true;
 
         private readonly Dictionary<NetUserId, ChatUser> _players = new();
+        private PatronManager _patronManager = new PatronManager(); // Delta-V
 
         public void Initialize()
         {
@@ -65,6 +69,7 @@ public void Initialize()
             _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
 
             _playerManager.PlayerStatusChanged += PlayerStatusChanged;
+            _patronManager.Load(_resourceManager); // Delta-V
         }
 
         private void OnOocEnabledChanged(bool val)
@@ -244,10 +249,23 @@ private void SendOOC(ICommonSession player, string message)
                 var prefs = _preferencesManager.GetPreferences(player.UserId);
                 colorOverride = prefs.AdminOOCColor;
             }
-            if (  _netConfigManager.GetClientCVar(player.Channel, CCVars.ShowOocPatronColor) && player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor))
+
+            // Delta-V: Begin
+            Patron? deltaVPatron = _patronManager.GetPatronByName(player.Name);
+            if (_netConfigManager.GetClientCVar(player.Channel, CCVars.ShowOocPatronColor))
             {
-                wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                // Delta-V patron name coloring takes precedence over SS14 patron name coloring.
+                if (deltaVPatron != null)
+                {
+                    // Delta-V patron.
+                    wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", deltaVPatron.Tier.Color), ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                } else if (player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor))
+                {
+                    // SS14 patron.
+                    wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor), ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                }
             }
+            // Delta-V: End
 
             //TODO: player.Name color, this will need to change the structure of the MsgChatMessage
             ChatMessageToAll(ChatChannel.OOC, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride, author: player.UserId);

Content.Server/Corvax/GameTicking/RoundEndedEvent.cs

@@ -0,0 +1,13 @@
+namespace Content.Server.Corvax.GameTicking;
+
+public sealed class RoundEndedEvent : EntityEventArgs
+{
+    public int RoundId { get; }
+    public TimeSpan RoundDuration { get; }
+
+    public RoundEndedEvent(int roundId, TimeSpan roundDuration)
+    {
+        RoundId = roundId;
+        RoundDuration = roundDuration;
+    }
+}

Content.Server/Corvax/GameTicking/RoundStartedEvent.cs

@@ -0,0 +1,11 @@
+namespace Content.Server.Corvax.GameTicking;
+
+public sealed class RoundStartedEvent : EntityEventArgs
+{
+    public int RoundId { get; }
+
+    public RoundStartedEvent(int roundId)
+    {
+        RoundId = roundId;
+    }
+}

Content.Server/Corvax/StationGoal/StationGoalCommand.cs

@@ -0,0 +1,55 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Corvax.StationGoal
+{
+    [AdminCommand(AdminFlags.Fun)]
+    public sealed class StationGoalCommand : IConsoleCommand
+    {
+        public string Command => "sendstationgoal";
+        public string Description => Loc.GetString("send-station-goal-command-description");
+        public string Help => Loc.GetString("send-station-goal-command-help-text", ("command", Command));
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length != 1)
+            {
+                shell.WriteError(Loc.GetString("shell-need-exactly-one-argument"));
+                return;
+            }
+
+            var protoId = args[0];
+            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+            if (!prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
+            {
+                shell.WriteError(Loc.GetString("send-station-goal-command-error-no-goal-proto", ("id", protoId)));
+                return;
+            }
+
+            var stationGoalPaper = IoCManager.Resolve<IEntityManager>().System<StationGoalPaperSystem>();
+            if (!stationGoalPaper.SendStationGoal(proto))
+            {
+                shell.WriteError(Loc.GetString("send-station-goal-command-error-couldnt-fax"));
+                return;
+            }
+        }
+
+        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        {
+            if (args.Length == 1)
+            {
+                var options = IoCManager.Resolve<IPrototypeManager>()
+                    .EnumeratePrototypes<StationGoalPrototype>()
+                    .OrderBy(p => p.ID)
+                    .Select(p => new CompletionOption(p.ID));
+
+                return CompletionResult.FromHintOptions(options, Loc.GetString("send-station-goal-command-arg-id"));
+            }
+
+            return CompletionResult.Empty;
+        }
+    }
+}

Content.Server/Corvax/StationGoal/StationGoalPaperComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Server.Corvax.StationGoal
+{
+    /// <summary>
+    ///     Paper with a written station goal in it.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class StationGoalPaperComponent : Component
+    {
+    }
+}