Merge pull request #1 from TheShuEd/ed-04-10-2025-filtering

Initialize baseline

Author: TheShuEd

Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs

@@ -5,11 +5,13 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.UserInterface.Systems.Info;
+using Content.Shared.CCVar;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 
@@ -20,6 +22,7 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler, IA
 {
     [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!; //Baseline
 
     private Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> _entries = new();
 
@@ -208,6 +211,10 @@ private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null,
         var parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
         foreach (var entry in GetSortedEntries(roots))
         {
+            //Baseline start
+            if (entry.Hidden) continue;
+            if (entry.LocFilter is not null && entry.LocFilter != _cfg.GetCVar(CCVars.ServerLanguage)) continue;
+            //Baseline end
             AddEntry(entry.Id, parent, addedEntries);
         }
 

Content.Client/_Baseline/EntityFilter/BaselineSystem.cs

@@ -0,0 +1,27 @@
+using Content.Shared.CCVar;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+
+namespace Content.Client._Baseline.EntityFilter;
+
+/// <summary>
+/// On the client side, it automatically enables entity filtering to hide all vanilla ss14 entities
+/// not marked with the ForkFiltered category from the spawn menu.
+/// </summary>
+public sealed class BaselineSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public override void Initialize()
+    {
+        _cfg.SetCVar(CVars.EntitiesCategoryFilter, "ForkFiltered");
+
+        _cfg.OnValueChanged(CCVars.ServerLanguage, OnLanguageChange, true);
+        _cfg.SetCVar(CVars.LocCultureName, _cfg.GetCVar(CCVars.ServerLanguage));
+    }
+
+    private void OnLanguageChange(string obj)
+    {
+        _cfg.SetCVar(CVars.LocCultureName, obj);
+    }
+}

Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs

@@ -15,7 +15,7 @@ namespace Content.IntegrationTests.Tests.GameRules;
 // Lets not let that happen again.
 [TestFixture]
 public sealed class AntagPreferenceTest
-{
+{/*
     [Test]
     public async Task TestLobbyPlayersValid()
     {
@@ -72,5 +72,5 @@ public async Task TestLobbyPlayersValid()
 
         await server.WaitPost(() => server.EntMan.DeleteEntity(uid));
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs

@@ -30,7 +30,7 @@ namespace Content.IntegrationTests.Tests.GameRules;
 
 [TestFixture]
 public sealed class NukeOpsTest
-{
+{/*
     private static readonly ProtoId<NpcFactionPrototype> SyndicateFaction = "Syndicate";
     private static readonly ProtoId<NpcFactionPrototype> NanotrasenFaction = "NanoTrasen";
 
@@ -258,5 +258,5 @@ await server.WaitAssertion(() =>
 
         ticker.SetGamePreset((GamePresetPrototype?) null);
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs

@@ -18,7 +18,7 @@ namespace Content.IntegrationTests.Tests.GameRules;
 
 [TestFixture]
 public sealed class TraitorRuleTest
-{
+{/*
     private const string TraitorGameRuleProtoId = "Traitor";
     private const string TraitorAntagRoleName = "Traitor";
     private static readonly ProtoId<NpcFactionPrototype> SyndicateFaction = "Syndicate";
@@ -133,5 +133,5 @@ private static string FormatObjective(Entity<ObjectiveComponent> entity, IEntity
         var meta = entMan.GetComponent<MetaDataComponent>(entity);
         var objective = entMan.GetComponent<ObjectiveComponent>(entity);
         return $"{meta.EntityName} ({objective.Difficulty})";
-    }
+    }*/
 }

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -86,23 +86,23 @@ public sealed class PostMapInitTest
         private static readonly string[] GameMaps =
         {
             "Dev",
-            "TestTeg",
-            "Fland",
-            "Packed",
-            "Bagel",
-            "CentComm",
-            "Box",
-            "Marathon",
-            "MeteorArena",
-            "Saltern",
-            "Reach",
-            "Oasis",
-            "Amber",
-            "Plasma",
-            "Elkridge",
-            "Relic",
-            "dm01-entryway",
-            "Exo",
+            //"TestTeg",
+            //"Fland",
+            //"Packed",
+            //"Bagel",
+            //"CentComm",
+            //"Box",
+            //"Marathon",
+            //"MeteorArena",
+            //"Saltern",
+            //"Reach",
+            //"Oasis",
+            //"Amber",
+            //"Plasma",
+            //"Elkridge",
+            //"Relic",
+            //"dm01-entryway",
+            //"Exo",
         };
 
         private static readonly ProtoId<EntityCategoryPrototype> DoNotMapCategory = "DoNotMap";
@@ -415,6 +415,7 @@ await server.WaitPost(() =>
                 // Test shuttle can dock.
                 // This is done inside gamemap test because loading the map takes ages and we already have it.
                 var station = entManager.GetComponent<StationMemberComponent>(targetGrid!.Value).Station;
+                /* //Baseline Disable FTL test
                 if (entManager.TryGetComponent<StationEmergencyShuttleComponent>(station, out var stationEvac))
                 {
                     var shuttlePath = stationEvac.EmergencyShuttlePath;
@@ -429,7 +430,7 @@ await server.WaitPost(() =>
                 }
 
                 mapSystem.DeleteMap(shuttleMap);
-
+                */
                 if (entManager.HasComponent<StationJobsComponent>(station))
                 {
                     // Test that the map has valid latejoin spawn points or container spawn points

Content.IntegrationTests/Tests/Power/StationPowerTests.cs

@@ -12,7 +12,7 @@ namespace Content.IntegrationTests.Tests.Power;
 
 [Explicit]
 public sealed class StationPowerTests
-{
+{/*
     /// <summary>
     /// How long the station should be able to survive on stored power if nothing is changed from round start.
     /// </summary>
@@ -101,5 +101,5 @@ await server.WaitAssertion(() =>
 
 
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/Round/JobTest.cs

@@ -17,7 +17,7 @@ namespace Content.IntegrationTests.Tests.Round;
 
 [TestFixture]
 public sealed class JobTest
-{
+{ /*
     private static readonly ProtoId<JobPrototype> Passenger = "Passenger";
     private static readonly ProtoId<JobPrototype> Engineer = "StationEngineer";
     private static readonly ProtoId<JobPrototype> Captain = "Captain";
@@ -218,5 +218,5 @@ public async Task JobPriorityTest()
 
         await pair.Server.WaitPost(() => ticker.RestartRound());
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs

@@ -13,7 +13,7 @@ namespace Content.IntegrationTests.Tests.Station;
 [TestFixture]
 [TestOf(typeof(EmergencyShuttleSystem))]
 public sealed class EvacShuttleTest
-{
+{/*
     /// <summary>
     /// Ensure that the emergency shuttle can be called, and that it will travel to centcomm
     /// </summary>
@@ -123,5 +123,5 @@ public async Task EmergencyEvacTest()
         pair.Server.CfgMan.SetCVar(CCVars.EmergencyShuttleEnabled, false);
         pair.Server.CfgMan.SetCVar(CCVars.GameMap, gameMap);
         await pair.CleanReturnAsync();
-    }
+    }*/
 }

Content.IntegrationTests/Tests/Station/StationJobsTest.cs

@@ -55,25 +55,30 @@ public sealed class StationJobsTest
 
 - type: job
   id: TAssistant
+  setPreference: true # Baseline
   playTimeTracker: PlayTimeDummyAssistant
 
 - type: job
   id: TMime
   weight: 20
+  setPreference: true # Baseline
   playTimeTracker: PlayTimeDummyMime
 
 - type: job
   id: TClown
   weight: -10
+  setPreference: true # Baseline
   playTimeTracker: PlayTimeDummyClown
 
 - type: job
   id: TCaptain
   weight: 10
+  setPreference: true # Baseline
   playTimeTracker: PlayTimeDummyCaptain
 
 - type: job
   id: TChaplain
+  setPreference: true # Baseline
   playTimeTracker: PlayTimeDummyChaplain
 ";