Merge branch 'master' into 2024-12-26-Kegs

Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -29,7 +29,6 @@
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Database;
 using Content.Shared.Preferences;
-using Content.Shared.Shuttles.Components;
 using static Content.Shared.Shipyard.Components.ShuttleDeedComponent;
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
@@ -38,7 +37,6 @@
 using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
 using Content.Shared.Access;
-using Content.Shared.Tiles;
 using Content.Server._NF.Smuggling.Components;
 using Content.Shared._NF.ShuttleRecords;
 using Content.Server.StationEvents.Components;
@@ -203,14 +201,6 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp
             shuttleStation = _station.InitializeNewStation(stationProto.Stations[vessel.ID], gridUids);
             var metaData = MetaData((EntityUid)shuttleStation);
             name = metaData.EntityName;
-            _shuttle.SetIFFColor(shuttleUid, new Color
-            {
-                R = 10,
-                G = 50,
-                B = 100,
-                A = 100
-            });
-            _shuttle.AddIFFFlag(shuttleUid, IFFFlags.IsPlayerShuttle);
         }
 
         if (TryComp<AccessComponent>(targetId, out var newCap))

Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server._NF.Shuttles.Components; // Frontier: NPC knockdown immunity
+using Content.Server._NF.Shuttles.Components; // Frontier: FTL knockdown immunity
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Events;
@@ -637,11 +637,9 @@ private void DoTheDinosaur(TransformComponent xform)
             {
                 if (!_statusQuery.TryGetComponent(child, out var status))
                     continue;
-
-                if (HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: NPC knockdown immunity
-                    continue; // Frontier: NPC knockdown immunity
 
-                _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
+                if (!HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: FTL knockdown immunity
+                    _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
 
                 // If the guy we knocked down is on a spaced tile, throw them too
                 if (grid != null)

Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs

@@ -4,22 +4,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using Content.Server._NF.Bank;
+using Content.Server._NF.GameRule.Components;
 using Content.Server._NF.GameTicking.Events;
-using Content.Shared.GameTicking.Components;
-using Robust.Shared.Prototypes;
 using Content.Server.Cargo.Components;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules;
-using Content.Shared._NF.CCVar; // Frontier
-using Robust.Shared.Configuration;
 using Content.Shared._NF.Bank;
-using Content.Server._NF.GameRule.Components;
-using Content.Server._NF.Bank;
-using Robust.Shared.Player;
-using Robust.Shared.Network;
+using Content.Shared._NF.CCVar;
 using Content.Shared.GameTicking;
-using Robust.Shared.Enums;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server._NF.GameRule;
 
@@ -28,14 +29,17 @@ namespace Content.Server._NF.GameRule;
 /// </summary>
 public sealed class NFAdventureRuleSystem : GameRuleSystem<NFAdventureRuleComponent>
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly BankSystem _bank = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly PointOfInterestSystem _poi = default!;
 
     private readonly HttpClient _httpClient = new();
 
+    private readonly ProtoId<GamePresetPrototype> _fallbackPresetID = "NFPirates";
+
     public sealed class PlayerRoundBankInformation
     {
         // Initial balance, obtained on spawn
@@ -68,7 +72,7 @@ public override void Initialize()
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawningEvent);
         SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetachedEvent);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-        _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
+        _player.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
     }
 
     protected override void AppendRoundEndText(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev)
@@ -196,8 +200,14 @@ protected override void Started(EntityUid uid, NFAdventureRuleComponent componen
         List<PointOfInterestPrototype> optionalProtos = new();
         Dictionary<string, List<PointOfInterestPrototype>> remainingUniqueProtosBySpawnGroup = new();
 
-        foreach (var location in _prototypeManager.EnumeratePrototypes<PointOfInterestPrototype>())
+        var currentPreset = _ticker.CurrentPreset?.ID ?? _fallbackPresetID;
+
+        foreach (var location in _proto.EnumeratePrototypes<PointOfInterestPrototype>())
         {
+            // Check if any preset is accepted (empty) or if current preset is supported.
+            if (location.SpawnGamePreset.Length > 0 && !location.SpawnGamePreset.Contains(currentPreset))
+                continue;
+
             if (location.SpawnGroup == "CargoDepot")
                 depotProtos.Add(location);
             else if (location.SpawnGroup == "MarketStation")
@@ -228,7 +238,7 @@ protected override void Started(EntityUid uid, NFAdventureRuleComponent componen
     private async Task ReportRound(string message, int color = 0x77DDE7)
     {
         Logger.InfoS("discord", message);
-        string webhookUrl = _configurationManager.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
+        string webhookUrl = _cfg.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
         if (webhookUrl == string.Empty)
             return;
 
@@ -249,7 +259,7 @@ private async Task ReportRound(string message, int color = 0x77DDE7)
 
     private async Task ReportLedger(int color = 0xBF863F)
     {
-        string webhookUrl = _configurationManager.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
+        string webhookUrl = _cfg.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
         if (webhookUrl == string.Empty)
             return;
 

Content.Server/_NF/GameRule/PointOfInterestPrototype.cs

@@ -1,19 +1,27 @@
 using Content.Server.GameTicking.Presets;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
 namespace Content.Server._NF.GameRule;
 
 /// <summary>
 ///     Describes information for a single point of interest to be spawned in the world
 /// </summary>
-[Prototype("pointOfInterest")]
+[Prototype]
 [Serializable]
-public sealed partial class PointOfInterestPrototype : IPrototype
+public sealed partial class PointOfInterestPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<PointOfInterestPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    [NeverPushInheritance]
+    [AbstractDataField]
+    public bool Abstract { get; private set; }
+
     /// <summary>
     ///     The name of this point of interest
     /// </summary>
@@ -48,10 +56,12 @@ public sealed partial class PointOfInterestPrototype : IPrototype
     ///     Components to be added to any spawned grids.
     /// </summary>
     [DataField]
+    [AlwaysPushInheritance]
     public ComponentRegistry AddComponents { get; set; } = new();
 
     /// <summary>
     ///     What gamepresets ID this POI is allowed to spawn on.
+    ///     If left empty, all presets are allowed.
     /// </summary>
     [DataField]
     public ProtoId<GamePresetPrototype>[] SpawnGamePreset { get; private set; } = [];

Content.Server/_NF/GameRule/PointOfInterestSystem.cs

@@ -1,16 +1,16 @@
 using System.Linq;
 using System.Numerics;
+using Content.Server.Maps;
+using Content.Server.Station.Systems;
+using Content.Server.GameTicking;
+using Content.Shared._NF.CCVar;
+using Content.Shared.GameTicking;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Content.Server.Maps;
-using Content.Server.Station.Systems;
-using Content.Server.GameTicking;
-using Content.Shared._NF.CCVar;
-using Content.Shared.GameTicking;
 
 namespace Content.Server._NF.GameRule;
 
@@ -20,14 +20,14 @@ namespace Content.Server._NF.GameRule;
 //[Access(typeof(NfAdventureRuleSystem))]
 public sealed class PointOfInterestSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
-    [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly StationSystem _station = default!;
 
     private List<Vector2> _stationCoords = new();
 
@@ -55,7 +55,7 @@ public void GenerateDepots(MapId mapUid, List<PointOfInterestPrototype> depotPro
         //by the number of depots set in our corresponding cvar
 
         depotStations = new List<EntityUid>();
-        var depotCount = _configurationManager.GetCVar(NFCCVars.CargoDepots);
+        var depotCount = _cfg.GetCVar(NFCCVars.CargoDepots);
         var rotation = 2 * Math.PI / depotCount;
         var rotationOffset = _random.NextAngle() / depotCount;
 
@@ -68,7 +68,8 @@ public void GenerateDepots(MapId mapUid, List<PointOfInterestPrototype> depotPro
         {
             var proto = _random.Pick(depotPrototypes);
 
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             Vector2i offset = new Vector2i((int) _random.Next(proto.MinimumDistance, proto.MaximumDistance), 0);
@@ -96,7 +97,7 @@ public void GenerateMarkets(MapId mapUid, List<PointOfInterestPrototype> marketP
         //ideal world
 
         marketStations = new List<EntityUid>();
-        var marketCount = _configurationManager.GetCVar(NFCCVars.MarketStations);
+        var marketCount = _cfg.GetCVar(NFCCVars.MarketStations);
         _random.Shuffle(marketPrototypes);
         int marketsAdded = 0;
 
@@ -106,7 +107,8 @@ public void GenerateMarkets(MapId mapUid, List<PointOfInterestPrototype> marketP
 
         foreach (var proto in marketPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             if (marketsAdded >= marketCount)
@@ -130,7 +132,7 @@ public void GenerateOptionals(MapId mapUid, List<PointOfInterestPrototype> optio
         //and most RP places. This will essentially put them all into a pool to pull from, and still does not use the RNG function.
 
         optionalStations = new List<EntityUid>();
-        var optionalCount = _configurationManager.GetCVar(NFCCVars.OptionalStations);
+        var optionalCount = _cfg.GetCVar(NFCCVars.OptionalStations);
         _random.Shuffle(optionalPrototypes);
         int optionalsAdded = 0;
 
@@ -140,7 +142,8 @@ public void GenerateOptionals(MapId mapUid, List<PointOfInterestPrototype> optio
 
         foreach (var proto in optionalPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             if (optionalsAdded >= optionalCount)
@@ -171,7 +174,8 @@ public void GenerateRequireds(MapId mapUid, List<PointOfInterestPrototype> requi
 
         foreach (var proto in requiredPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance);
@@ -205,7 +209,8 @@ public void GenerateUniques(MapId mapUid, Dictionary<string, List<PointOfInteres
             _random.Shuffle(prototypeList);
             foreach (var proto in prototypeList)
             {
-                if (!proto.SpawnGamePreset.Contains(currentPreset))
+                // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+                if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                     continue;
 
                 var chance = _random.NextFloat(0, 1);
@@ -238,7 +243,7 @@ private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vecto
             string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName;
 
             EntityUid? stationUid = null;
-            if (_prototypeManager.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
+            if (_proto.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
             {
                 stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName);
             }
@@ -270,8 +275,8 @@ private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vecto
 
     private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange)
     {
-        int numRetries = int.Max(_configurationManager.GetCVar(NFCCVars.POIPlacementRetries), 0);
-        float minDistance = float.Max(_configurationManager.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness
+        int numRetries = int.Max(_cfg.GetCVar(NFCCVars.POIPlacementRetries), 0);
+        float minDistance = float.Max(_cfg.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness
 
         Vector2 coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange);
         for (int i = 0; i < numRetries; i++)

Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs

@@ -1,6 +1,3 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
 namespace Content.Server._NF.Shuttles.Components;
 
 /// <summary>