Merge branch 'master' into 2024-10-13-UnusedShips

new-frontiers-14 · Oct 13, 2024 · c70dcbd · c70dcbd
2 parents 9f717f8 + 583eca4
commit c70dcbd
Show file tree

Hide file tree

Showing 62 changed files with 709 additions and 1,245 deletions.
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -50,11 +50,11 @@ jobs:
     - name: Run Content.Tests
       run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
 
-    # - name: Run Content.IntegrationTests
-      # shell: pwsh
-      # run: |
-        # $env:DOTNET_gcServer=1
-        # dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+#    - name: Run Content.IntegrationTests
+#      shell: pwsh
+#      run: |
+#        $env:DOTNET_gcServer=1
+#        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
   ci-success:
     name: Build & Test Debug
     needs:

diff --git a/.github/workflows/nf-shipyard-tests.yml b/.github/workflows/nf-shipyard-tests.yml
@@ -24,13 +24,15 @@ jobs:
     - name: Setup Submodule
       run: |
         git submodule update --init --recursive
+
     - name: Pull engine updates
       uses: space-wizards/submodule-dependency@v0.1.5
 
     - name: Update Engine Submodules
       run: |
         cd RobustToolbox/
         git submodule update --init --recursive
+
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:

diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml
@@ -38,4 +38,4 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Update Credits
-          commit_author: FrontierATC <zuuswa@gmail.com>
+          commit_author: FrontierATC <zuuswa@gmail.com>
diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Execution;
@@ -95,7 +95,7 @@ await server.WaitAssertion(() =>
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             Assert.Multiple(() =>
             {
-                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                //Assert.That(mobStateSystem.IsDead(player, mobStateComp)); // DeltaV - /suicide is the same as /ghost
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
             });
@@ -158,17 +158,17 @@ await server.WaitAssertion(() =>
 
             Assert.Multiple(() =>
             {
-                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                //Assert.That(mobStateSystem.IsDead(player, mobStateComp)); // DeltaV - /suicide is the same as /ghost
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
-                Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(lethalDamageThreshold));
+                //Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(lethalDamageThreshold)); // DeltaV - /suicide is the same as /ghost
             });
         });
 
         await pair.CleanReturnAsync();
     }
 
-        /// <summary>
+    /// <summary>
     /// Run the suicide command in the console
     /// Should only ghost the player but not kill them
     /// </summary>
@@ -210,7 +210,7 @@ await server.WaitAssertion(() =>
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             Assert.Multiple(() =>
             {
-                Assert.That(mobStateSystem.IsAlive(player, mobStateComp));
+                //Assert.That(mobStateSystem.IsAlive(player, mobStateComp)); // DeltaV: 
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
             });
@@ -281,10 +281,10 @@ await server.WaitAssertion(() =>
 
             Assert.Multiple(() =>
             {
-                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                //Assert.That(mobStateSystem.IsDead(player, mobStateComp)); // DeltaV
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
-                Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold));
+                //Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold)); // DeltaV
             });
         });
 
@@ -353,10 +353,10 @@ await server.WaitAssertion(() =>
 
             Assert.Multiple(() =>
             {
-                Assert.That(mobStateSystem.IsDead(player, mobStateComp));
+                //Assert.That(mobStateSystem.IsDead(player, mobStateComp)); // DeltaV
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
-                Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold / 2));
+                //Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold / 2)); // DeltaV
             });
         });
 

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -310,7 +310,10 @@ await server.WaitPost(() =>
                 // Check that the number of entities has gone back to the original value.
                 if (server.EntMan.EntityCount != count)
                 {
-                    Assert.Fail($"Server prototype {protoId} failed on deletion count didn't reset properly");
+                    // Frontier: add expected vs. actual
+                    Assert.Fail($"Server prototype {protoId} failed on deletion count didn't reset properly:\n" +
+                                $"Expected {count} and found {server.EntMan.EntityCount}.\n");
+                    // End Frontier
                 }
 
                 if (client.EntMan.EntityCount != clientCount)

diff --git a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
@@ -17,6 +17,7 @@ namespace Content.IntegrationTests.Tests.GameRules;
 public sealed class AntagPreferenceTest
 {
     [Test]
+    [Ignore("Antag role selection isn't used on Frontier.")] // Frontier
     public async Task TestLobbyPlayersValid()
     {
         await using var pair = await PoolManager.GetServerClient(new PoolSettings

diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
@@ -74,7 +74,7 @@ public async Task FailAndStartTest()
 
         Assert.That(server.CfgMan.GetCVar(CCVars.GridFill), Is.False);
         Assert.That(server.CfgMan.GetCVar(CCVars.GameLobbyFallbackEnabled), Is.True);
-        Assert.That(server.CfgMan.GetCVar(CCVars.GameLobbyDefaultPreset), Is.EqualTo("secret"));
+        Assert.That(server.CfgMan.GetCVar(CCVars.GameLobbyDefaultPreset), Is.EqualTo("adventure")); // Frontier: secret<adventure - we use adventure gamemode by default
         server.CfgMan.SetCVar(CCVars.GridFill, true);
         server.CfgMan.SetCVar(CCVars.GameLobbyFallbackEnabled, false);
         server.CfgMan.SetCVar(CCVars.GameLobbyDefaultPreset, "TestPreset");
@@ -113,7 +113,7 @@ public async Task FailAndStartTest()
         ticker.SetGamePreset((GamePresetPrototype?) null);
         server.CfgMan.SetCVar(CCVars.GridFill, false);
         server.CfgMan.SetCVar(CCVars.GameLobbyFallbackEnabled, true);
-        server.CfgMan.SetCVar(CCVars.GameLobbyDefaultPreset, "secret");
+        server.CfgMan.SetCVar(CCVars.GameLobbyDefaultPreset, "adventure"); // Frontier: secret<adventure - we use adventure gamemode by default
         server.System<TestRuleSystem>().Run = false;
         await pair.CleanReturnAsync();
     }

diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -32,6 +32,7 @@ public sealed class NukeOpsTest
     /// Check that a nuke ops game mode can start without issue. I.e., that the nuke station and such all get loaded.
     /// </summary>
     [Test]
+    [Ignore("Not relevant for Frontier, no nuke ops gameplay.")] // Frontier
     public async Task TryStopNukeOpsFromConstantlyFailing()
     {
         await using var pair = await PoolManager.GetServerClient(new PoolSettings

diff --git a/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs b/Content.IntegrationTests/Tests/GameRules/TraitorRuleTest.cs
@@ -22,6 +22,7 @@ public sealed class TraitorRuleTest
     private const string TraitorAntagRoleName = "Traitor";
 
     [Test]
+    [Ignore("Traitor role selection isn't used on Frontier.")] // Frontier
     public async Task TestTraitorObjectives()
     {
         await using var pair = await PoolManager.GetServerClient(new PoolSettings()

diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs
@@ -73,6 +73,7 @@ await server.WaitAssertion(() =>
   equipment:
     mask: ClothingMaskBreath
     suitstorage: OxygenTankFilled
+    outerClothing: ClothingOuterVestTank # Frontier
 
 - type: job
   id: TestInternalsDummy

diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -49,10 +49,15 @@ await server.WaitAssertion(() =>
                     continue;
                 var mId = mbc.Prototype;
 
+                // Frontier: we accept null as board prototypes, but this will fail the assertions.
+                if (mId == "Null")
+                    continue;
+                // End Frontier
+
                 Assert.Multiple(() =>
                 {
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
-                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
+                        $"Machine board {p.ID}'s corresponding machine has an invalid prototype."); // Frontier
                     Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp, compFact),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
                     Assert.That(mComp.Board, Is.EqualTo(p.ID),

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -27,8 +27,9 @@ namespace Content.IntegrationTests.Tests
     public sealed class PostMapInitTest
     {
         private const bool SkipTestMaps = true;
-        private const string TestMapsPath = "/Maps/Test/";
+        private const string TestMapsPath = "/Maps/_NF/Test/"; // Frontier: _NF
 
+        // Frontier: TODO - define this to our set of maps of interest
         private static readonly string[] NoSpawnMaps =
         {
             "CentComm",
@@ -116,7 +117,7 @@ public async Task NoSavedPostMapInitTest()
             var server = pair.Server;
 
             var resourceManager = server.ResolveDependency<IResourceManager>();
-            var mapFolder = new ResPath("/Maps");
+            var mapFolder = new ResPath("/Maps/_NF"); // Frontier: add _NF
             var maps = resourceManager
                 .ContentFindFiles(mapFolder)
                 .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
@@ -311,6 +312,14 @@ public async Task AllMapsTested()
 
             var gameMaps = protoMan.EnumeratePrototypes<GameMapPrototype>()
                 .Where(x => !pair.IsTestPrototype(x))
+                // Frontier: FIXME - hacky test fix
+                .Where(x =>
+                    x.ID == PoolManager.TestMap || // Frontier: check test map
+                    (x.MapPath.ToString().StartsWith("/Maps/_NF") && // Frontier: check frontier maps only
+                    !x.MapPath.ToString().StartsWith("/Maps/_NF/Shuttles") && // Frontier: skip shuttles (not loaded as maps)
+                    !x.MapPath.ToString().StartsWith("/Maps/_NF/POI")) // Frontier: skip POIs (not loaded as maps)
+                    )
+                // End Frontier
                 .Select(x => x.ID)
                 .ToHashSet();
 
@@ -337,7 +346,7 @@ public async Task NonGameMapsLoadableTest()
 
             var gameMaps = protoManager.EnumeratePrototypes<GameMapPrototype>().Select(o => o.MapPath).ToHashSet();
 
-            var mapFolder = new ResPath("/Maps");
+            var mapFolder = new ResPath("/Maps/_NF"); // Frontier
             var maps = resourceManager
                 .ContentFindFiles(mapFolder)
                 .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))

diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -18,9 +18,9 @@ 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";
+    private static readonly ProtoId<JobPrototype> Passenger = "Contractor"; // Frontier: use job prototypes that exist
+    private static readonly ProtoId<JobPrototype> Engineer = "Pilot"; // Frontier
+    private static readonly ProtoId<JobPrototype> Captain = "StationRepresentative"; // Frontier
 
     private static string _map = "JobTestMap";
 

diff --git a/Content.IntegrationTests/Tests/SalvageTest.cs b/Content.IntegrationTests/Tests/SalvageTest.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.CCVar;
 using Content.Shared.Salvage;
 using Robust.Server.GameObjects;
@@ -17,6 +17,7 @@ public sealed class SalvageTest
     /// Asserts that all salvage maps have been saved as grids and are loadable.
     /// </summary>
     [Test]
+    [Ignore("Not currently used by Frontier.")] // Frontier
     public async Task AllSalvageMapsLoadableTest()
     {
         await using var pair = await PoolManager.GetServerClient();

diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -104,6 +104,7 @@ public sealed class VendingMachineRestockTest : EntitySystem
 ";
 
         [Test]
+        [Ignore("Frontier: restocks for vendors are intentionally unpurchaseable.")] // Frontier
         public async Task TestAllRestocksAreAvailableToBuy()
         {
             await using var pair = await PoolManager.GetServerClient();