tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor minds to be entities with components, make roles components (#19591)

Browse Source 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2023-08-28 16:53:24 -07:00
committed by GitHub
parent e0ee397af7
commit 15c0211fb2
119 changed files with 1445 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.IntegrationTests/Pair/TestPair.Recycle.cs
View File

@@ -2,6 +2,7 @@
using System.IO;
using System.Linq;
using Content.Server.GameTicking;
using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Shared.CCVar;
using Content.Shared.GameTicking;
@@ -38,7 +39,7 @@ public sealed partial class TestPair : IAsyncDisposable
await Server.WaitPost(() => Server.EntMan.DeleteEntity(TestMap.MapUid));
TestMap = null;
}
var usageTime = Watch.Elapsed;
Watch.Restart();
await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: Test borrowed pair {Id} for {usageTime.TotalMilliseconds} ms");
@@ -80,7 +81,7 @@ public sealed partial class TestPair : IAsyncDisposable
{
if (State != PairState.InUse)
throw new Exception($"{nameof(CleanReturnAsync)}: Unexpected state. Pair: {Id}. State: {State}.");
await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: Return of pair {Id} started");
State = PairState.CleanDisposed;
await OnCleanDispose();
@@ -106,7 +107,7 @@ public sealed partial class TestPair : IAsyncDisposable
throw new Exception($"{nameof(DisposeAsync)}: Unexpected state. Pair: {Id}. State: {State}.");
}
}
public async Task CleanPooledPair(PoolSettings settings, TextWriter testOut)
{
Settings = default!;
@@ -160,7 +161,7 @@ public sealed partial class TestPair : IAsyncDisposable
await ReallyBeIdle();
await testOut.WriteLineAsync($"Recycling: {Watch.Elapsed.TotalMilliseconds} ms: Done recycling");
}
public void ValidateSettings(PoolSettings settings)
{
var cfg = Server.CfgMan;
@@ -211,8 +212,9 @@ public sealed partial class TestPair : IAsyncDisposable
Assert.That(entMan.HasComponent<MindContainerComponent>(session.AttachedEntity));
var mindCont = entMan.GetComponent<MindContainerComponent>(session.AttachedEntity!.Value);
Assert.NotNull(mindCont.Mind);
Assert.Null(mindCont.Mind?.VisitingEntity);
Assert.That(mindCont.Mind!.OwnedEntity, Is.EqualTo(session.AttachedEntity!.Value));
Assert.That(mindCont.Mind.UserId, Is.EqualTo(session.UserId));
Assert.True(entMan.TryGetComponent(mindCont.Mind, out MindComponent? mind));
Assert.Null(mind!.VisitingEntity);
Assert.That(mind.OwnedEntity, Is.EqualTo(session.AttachedEntity!.Value));
Assert.That(mind.UserId, Is.EqualTo(session.UserId));
}
}
}

16
Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
View File

@@ -44,19 +44,20 @@ public sealed class GhostRoleTests
var conHost = client.ResolveDependency<IConsoleHost>();
var mindSystem = entMan.System<MindSystem>();
var session = sPlayerMan.ServerSessions.Single();
var originalMind = session.ContentData()!.Mind!;
var originalMindId = session.ContentData()!.Mind!.Value;
// Spawn player entity & attach
EntityUid originalMob = default;
await server.WaitPost(() =>
{
originalMob = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mindSystem.TransferTo(originalMind, originalMob, true);
mindSystem.TransferTo(originalMindId, originalMob, true);
});
// Check player got attached.
await pair.RunTicksSync(10);
Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
var originalMind = entMan.GetComponent<MindComponent>(originalMindId);
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
Assert.Null(originalMind.VisitingEntity);
@@ -66,7 +67,7 @@ public sealed class GhostRoleTests
var ghost = session.AttachedEntity;
Assert.That(entMan.HasComponent<GhostComponent>(ghost));
Assert.That(ghost, Is.Not.EqualTo(originalMob));
Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalMind));
Assert.That(session.ContentData()?.Mind, Is.EqualTo(originalMindId));
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
Assert.That(originalMind.VisitingEntity, Is.EqualTo(ghost));
@@ -83,8 +84,9 @@ public sealed class GhostRoleTests
// Check player got attached to ghost role.
await pair.RunTicksSync(10);
var newMind = session.ContentData()!.Mind!;
Assert.That(newMind, Is.Not.EqualTo(originalMind));
var newMindId = session.ContentData()!.Mind!.Value;
var newMind = entMan.GetComponent<MindComponent>(newMindId);
Assert.That(newMindId, Is.Not.EqualTo(originalMindId));
Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
Assert.Null(newMind.VisitingEntity);
@@ -101,12 +103,12 @@ public sealed class GhostRoleTests
Assert.That(entMan.HasComponent<GhostComponent>(otherGhost));
Assert.That(otherGhost, Is.Not.EqualTo(originalMob));
Assert.That(otherGhost, Is.Not.EqualTo(ghostRole));
Assert.That(session.ContentData()?.Mind, Is.EqualTo(newMind));
Assert.That(session.ContentData()?.Mind, Is.EqualTo(newMindId));
Assert.That(newMind.OwnedEntity, Is.EqualTo(ghostRole));
Assert.That(newMind.VisitingEntity, Is.EqualTo(session.AttachedEntity));
// Next, control the original entity again:
await server.WaitPost(() => mindSystem.SetUserId(originalMind, session.UserId));
await server.WaitPost(() => mindSystem.SetUserId(originalMindId, session.UserId));
await pair.RunTicksSync(10);
Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));

34
Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
View File

@@ -31,7 +31,8 @@ public sealed partial class MindTests
EntityUid playerEnt = default;
EntityUid visitEnt = default;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
await server.WaitAssertion(() =>
{
var player = playerMan.ServerSessions.Single();
@@ -39,9 +40,10 @@ public sealed partial class MindTests
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
visitEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mind = mindSystem.CreateMind(player.UserId);
mindSystem.TransferTo(mind, playerEnt);
mindSystem.Visit(mind, visitEnt);
mindId = mindSystem.CreateMind(player.UserId);
mind = entMan.GetComponent<MindComponent>(mindId);
mindSystem.TransferTo(mindId, playerEnt);
mindSystem.Visit(mindId, visitEnt);
Assert.Multiple(() =>
{
@@ -84,12 +86,14 @@ public sealed partial class MindTests
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
EntityUid playerEnt = default;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
await server.WaitAssertion(() =>
{
playerEnt = entMan.SpawnEntity(null, coordinates);
mind = player.ContentData()!.Mind!;
mindSystem.TransferTo(mind, playerEnt);
mindId = player.ContentData()!.Mind!.Value;
mind = entMan.GetComponent<MindComponent>(mindId);
mindSystem.TransferTo(mindId, playerEnt);
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
@@ -169,15 +173,15 @@ public sealed partial class MindTests
await server.WaitAssertion(() =>
{
ghost = entMan.SpawnEntity("MobObserver", MapCoordinates.Nullspace);
mindSystem.Visit(mind, ghost);
mindSystem.Visit(mind.Id, ghost);
});
Assert.Multiple(() =>
{
Assert.That(player.AttachedEntity, Is.EqualTo(ghost));
Assert.That(entMan.HasComponent<GhostComponent>(player.AttachedEntity), "player is not a ghost");
Assert.That(mind.VisitingEntity, Is.EqualTo(player.AttachedEntity));
Assert.That(mind.OwnedEntity, Is.EqualTo(originalEntity));
Assert.That(mind.Comp.VisitingEntity, Is.EqualTo(player.AttachedEntity));
Assert.That(mind.Comp.OwnedEntity, Is.EqualTo(originalEntity));
});
await pair.RunTicksSync(5);
@@ -192,8 +196,8 @@ public sealed partial class MindTests
{
Assert.That(player.AttachedEntity, Is.EqualTo(ghost));
Assert.That(entMan.HasComponent<GhostComponent>(player.AttachedEntity));
Assert.That(mind.VisitingEntity, Is.Null);
Assert.That(mind.OwnedEntity, Is.EqualTo(ghost));
Assert.That(mind.Comp.VisitingEntity, Is.Null);
Assert.That(mind.Comp.OwnedEntity, Is.EqualTo(ghost));
});
await pair.CleanReturnAsync();
@@ -233,8 +237,10 @@ public sealed partial class MindTests
Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.EqualTo("AdminObserver"));
});
var mind = player.ContentData()?.Mind;
Assert.That(mind, Is.Not.Null);
var mindId = player.ContentData()?.Mind;
Assert.That(mindId, Is.Not.Null);
var mind = entMan.GetComponent<MindComponent>(mindId.Value);
Assert.That(mind.VisitingEntity, Is.Null);
await pair.CleanReturnAsync();

36
Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Network;
using IPlayerManager = Robust.Server.Player.IPlayerManager;
namespace Content.IntegrationTests.Tests.Minds;
@@ -40,19 +39,21 @@ public sealed partial class MindTests
var player = playerMan.ServerSessions.Single();
EntityUid entity = default;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
await pair.Server.WaitPost(() =>
{
entity = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mind = mindSys.CreateMind(player.UserId);
mindSys.TransferTo(mind, entity);
mindId = mindSys.CreateMind(player.UserId);
mind = entMan.GetComponent<MindComponent>(mindId);
mindSys.TransferTo(mindId, entity);
});
await pair.RunTicksSync(5);
Assert.Multiple(() =>
{
Assert.That(player.ContentData()?.Mind, Is.EqualTo(mind));
Assert.That(player.ContentData()?.Mind, Is.EqualTo(mindId));
Assert.That(player.AttachedEntity, Is.EqualTo(entity));
Assert.That(player.AttachedEntity, Is.EqualTo(mind.CurrentEntity), "Player is not attached to the mind's current entity.");
Assert.That(entMan.EntityExists(mind.OwnedEntity), "The mind's current entity does not exist");
@@ -67,23 +68,25 @@ public sealed partial class MindTests
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var mindSys = entMan.System<MindSystem>();
EntityUid ghostUid = default;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.ServerSessions.Single();
await pair.Server.WaitAssertion(() =>
{
var oldUid = player.AttachedEntity;
ghostUid = entMan.SpawnEntity("MobObserver", MapCoordinates.Nullspace);
mind = mindSys.GetMind(player.UserId);
Assert.That(mind, Is.Not.Null);
mindId = mindSys.GetMind(player.UserId)!.Value;
Assert.That(mindId, Is.Not.EqualTo(default(EntityUid)));
mind = entMan.GetComponent<MindComponent>(mindId);
if (visit)
{
mindSys.Visit(mind, ghostUid);
mindSys.Visit(mindId, ghostUid);
return;
}
mindSys.TransferTo(mind, ghostUid);
mindSys.TransferTo(mindId, ghostUid);
if (oldUid != null)
entMan.DeleteEntity(oldUid.Value);
@@ -111,15 +114,16 @@ public sealed partial class MindTests
/// <summary>
/// Get the player's current mind and check that the entities exists.
/// </summary>
private static Mind GetMind(Pair.TestPair pair)
private static (EntityUid Id, MindComponent Comp) GetMind(Pair.TestPair pair)
{
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var player = playerMan.ServerSessions.SingleOrDefault();
Assert.That(player, Is.Not.Null);
var mind = player.ContentData()!.Mind;
Assert.That(mind, Is.Not.Null);
var mindId = player.ContentData()!.Mind!.Value;
Assert.That(mindId, Is.Not.EqualTo(default(EntityUid)));
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.Multiple(() =>
{
Assert.That(player.AttachedEntity, Is.EqualTo(mind.CurrentEntity), "Player is not attached to the mind's current entity.");
@@ -127,15 +131,17 @@ public sealed partial class MindTests
Assert.That(mind.VisitingEntity == null || entMan.EntityExists(mind.VisitingEntity), "The minds visited entity does not exist.");
});
return mind;
return (mindId, mind);
}
private static async Task Disconnect(Pair.TestPair pair)
{
var netManager = pair.Client.ResolveDependency<IClientNetManager>();
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var player = playerMan.ServerSessions.Single();
var mind = player.ContentData()!.Mind;
var mindId = player.ContentData()!.Mind!.Value;
var mind = entMan.GetComponent<MindComponent>(mindId);
await pair.Client.WaitAssertion(() =>
{

26
Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs
View File

@@ -29,8 +29,8 @@ public sealed partial class MindTests
{
Assert.That(GetMind(pair), Is.EqualTo(mind));
Assert.That(entMan.Deleted(ghost));
Assert.That(entMan.HasComponent<GhostComponent>(mind.OwnedEntity));
Assert.That(mind.VisitingEntity, Is.Null);
Assert.That(entMan.HasComponent<GhostComponent>(mind.Comp.OwnedEntity));
Assert.That(mind.Comp.VisitingEntity, Is.Null);
});
await pair.CleanReturnAsync();
@@ -52,11 +52,11 @@ public sealed partial class MindTests
var player = playerMan.ServerSessions.Single();
var name = player.Name;
var user = player.UserId;
Assert.That(mind.OwnedEntity, Is.Not.Null);
var entity = mind.OwnedEntity.Value;
Assert.That(mind.Comp.OwnedEntity, Is.Not.Null);
var entity = mind.Comp.OwnedEntity.Value;
// Player is not a ghost
Assert.That(!entMan.HasComponent<GhostComponent>(mind.CurrentEntity));
Assert.That(!entMan.HasComponent<GhostComponent>(mind.Comp.CurrentEntity));
// Disconnect
await Disconnect(pair);
@@ -67,7 +67,7 @@ public sealed partial class MindTests
Assert.Multiple(() =>
{
Assert.That(entMan.Deleted(entity));
Assert.That(mind.OwnedEntity, Is.Null);
Assert.That(mind.Comp.OwnedEntity, Is.Null);
});
// Reconnect
@@ -79,8 +79,8 @@ public sealed partial class MindTests
// Player is now a new ghost entity
Assert.That(GetMind(pair), Is.EqualTo(mind));
Assert.That(mind.OwnedEntity, Is.Not.EqualTo(entity));
Assert.That(entMan.HasComponent<GhostComponent>(mind.OwnedEntity));
Assert.That(mind.Comp.OwnedEntity, Is.Not.EqualTo(entity));
Assert.That(entMan.HasComponent<GhostComponent>(mind.Comp.OwnedEntity));
});
await pair.CleanReturnAsync();
@@ -98,7 +98,7 @@ public sealed partial class MindTests
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var mind = GetMind(pair);
var original = mind.CurrentEntity;
var original = mind.Comp.CurrentEntity;
var ghost = await VisitGhost(pair);
await DisconnectReconnect(pair);
@@ -106,7 +106,7 @@ public sealed partial class MindTests
Assert.Multiple(() =>
{
Assert.That(mind, Is.EqualTo(GetMind(pair)));
Assert.That(mind.CurrentEntity, Is.EqualTo(original));
Assert.That(mind.Comp.CurrentEntity, Is.EqualTo(original));
Assert.That(entMan.Deleted(original), Is.False);
Assert.That(entMan.Deleted(ghost));
});
@@ -128,12 +128,12 @@ public sealed partial class MindTests
var mind = GetMind(pair);
// Make player visit a new mob
var original = mind.CurrentEntity;
var original = mind.Comp.CurrentEntity;
EntityUid visiting = default;
await pair.Server.WaitAssertion(() =>
{
visiting = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mindSys.Visit(mind, visiting);
mindSys.Visit(mind.Id, visiting);
});
await pair.RunTicksSync(5);
@@ -145,7 +145,7 @@ public sealed partial class MindTests
Assert.That(GetMind(pair), Is.EqualTo(mind));
Assert.That(entMan.Deleted(original), Is.False);
Assert.That(entMan.Deleted(visiting), Is.False);
Assert.That(mind.CurrentEntity, Is.EqualTo(visiting));
Assert.That(mind.Comp.CurrentEntity, Is.EqualTo(visiting));
});
await pair.CleanReturnAsync();

128
Content.IntegrationTests/Tests/Minds/MindTests.cs
View File

@@ -8,17 +8,17 @@ using Content.Server.Mind.Commands;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Server.Roles;
using Content.Server.Roles.Jobs;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Shared.Roles;
using Robust.Server.Console;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using IPlayerManager = Robust.Server.Player.IPlayerManager;
namespace Content.IntegrationTests.Tests.Minds;
@@ -66,12 +66,13 @@ public sealed partial class MindTests
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mind = mindSystem.CreateMind(null);
var mindId = mindSystem.CreateMind(null);
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mind.UserId, Is.EqualTo(null));
mindSystem.TransferTo(mind, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
mindSystem.TransferTo(mindId, entity, mind: mind);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
});
await pair.CleanReturnAsync();
@@ -92,15 +93,16 @@ public sealed partial class MindTests
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mind = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
var mindId = mindSystem.CreateMind(null);
mindSystem.TransferTo(mindId, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
var mind2 = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind2, entity);
Assert.Multiple(() =>
{
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind2));
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mind.OwnedEntity, Is.Not.EqualTo(entity));
});
});
@@ -119,7 +121,7 @@ public sealed partial class MindTests
EntityUid entity = default!;
MindContainerComponent mindContainerComp = default!;
Mind mind = default!;
EntityUid mindId = default!;
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var damageableSystem = entMan.EntitySysManager.GetEntitySystem<DamageableSystem>();
@@ -128,12 +130,13 @@ public sealed partial class MindTests
entity = entMan.SpawnEntity("MindTestEntityDamageable", new MapCoordinates());
mindContainerComp = entMan.EnsureComponent<MindContainerComponent>(entity);
mind = mindSystem.CreateMind(null);
mindId = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind, entity);
mindSystem.TransferTo(mindId, entity);
Assert.Multiple(() =>
{
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mindId));
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(!mindSystem.IsCharacterDeadPhysically(mind));
});
});
@@ -149,13 +152,14 @@ public sealed partial class MindTests
}
damageableSystem.SetDamage(entity, damageable, new DamageSpecifier(prototype, FixedPoint2.New(401)));
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mindId));
});
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mindSystem.IsCharacterDeadPhysically(mind));
});
@@ -211,20 +215,22 @@ public sealed partial class MindTests
await pair.RunTicksSync(5);
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var originalMind = GetMind(pair);
var userId = originalMind.UserId;
var userId = originalMind.Comp.UserId;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
await server.WaitAssertion(() =>
{
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
entMan.DirtyEntity(entity);
mind = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind, entity);
mindId = mindSystem.CreateMind(null);
mind = entMan.GetComponent<MindComponent>(mindId);
mindSystem.TransferTo(mindId, entity);
Assert.Multiple(() =>
{
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
Assert.That(mindComp.HasMind);
});
});
@@ -233,18 +239,18 @@ public sealed partial class MindTests
await server.WaitAssertion(() =>
{
mindSystem.SetUserId(mind, userId);
mindSystem.SetUserId(mindId, userId);
Assert.Multiple(() =>
{
Assert.That(mind.UserId, Is.EqualTo(userId));
Assert.That(originalMind.UserId, Is.EqualTo(null));
Assert.That(originalMind.Comp.UserId, Is.EqualTo(null));
});
mindSystem.SetUserId(originalMind, userId);
mindSystem.SetUserId(originalMind.Id, userId);
Assert.Multiple(() =>
{
Assert.That(mind.UserId, Is.EqualTo(null));
Assert.That(originalMind.UserId, Is.EqualTo(userId));
Assert.That(originalMind.Comp.UserId, Is.EqualTo(userId));
});
});
@@ -264,57 +270,59 @@ public sealed partial class MindTests
await server.WaitAssertion(() =>
{
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var roleSystem = entMan.EntitySysManager.GetEntitySystem<RoleSystem>();
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mind = mindSystem.CreateMind(null);
var mindId = mindSystem.CreateMind(null);
var mind = entMan.EnsureComponent<MindComponent>(mindId);
Assert.That(mind.UserId, Is.EqualTo(null));
mindSystem.TransferTo(mind, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
mindSystem.TransferTo(mindId, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
Assert.Multiple(() =>
{
Assert.That(mindSystem.HasRole<TraitorRole>(mind), Is.False);
Assert.That(mindSystem.HasRole<Job>(mind), Is.False);
Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
});
var traitorRole = new TraitorRole(mind, new AntagPrototype());
var traitorRole = new TraitorRoleComponent();
mindSystem.AddRole(mind, traitorRole);
roleSystem.MindAddRole(mindId, traitorRole);
Assert.Multiple(() =>
{
Assert.That(mindSystem.HasRole<TraitorRole>(mind));
Assert.That(mindSystem.HasRole<Job>(mind), Is.False);
Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
});
var jobRole = new Job(mind, new JobPrototype());
var jobRole = new JobComponent();
mindSystem.AddRole(mind, jobRole);
roleSystem.MindAddRole(mindId, jobRole);
Assert.Multiple(() =>
{
Assert.That(mindSystem.HasRole<TraitorRole>(mind));
Assert.That(mindSystem.HasRole<Job>(mind));
Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId));
Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
});
mindSystem.RemoveRole(mind, traitorRole);
roleSystem.MindRemoveRole<TraitorRoleComponent>(mindId);
Assert.Multiple(() =>
{
Assert.That(mindSystem.HasRole<TraitorRole>(mind), Is.False);
Assert.That(mindSystem.HasRole<Job>(mind));
Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
Assert.That(roleSystem.MindHasRole<JobComponent>(mindId));
});
mindSystem.RemoveRole(mind, jobRole);
roleSystem.MindRemoveRole<JobComponent>(mindId);
Assert.Multiple(() =>
{
Assert.That(mindSystem.HasRole<TraitorRole>(mind), Is.False);
Assert.That(mindSystem.HasRole<Job>(mind), Is.False);
Assert.That(roleSystem.MindHasRole<TraitorRoleComponent>(mindId), Is.False);
Assert.That(roleSystem.MindHasRole<JobComponent>(mindId), Is.False);
});
});
@@ -335,7 +343,8 @@ public sealed partial class MindTests
var ghostSystem = entMan.EntitySysManager.GetEntitySystem<GhostSystem>();
EntityUid entity = default!;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.ServerSessions.Single();
await server.WaitAssertion(() =>
@@ -343,12 +352,13 @@ public sealed partial class MindTests
entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
mind = mindSystem.CreateMind(player.UserId, "Mindy McThinker");
mindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker");
mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mind.UserId, Is.EqualTo(player.UserId));
mindSystem.TransferTo(mind, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
mindSystem.TransferTo(mindId, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
});
await pair.RunTicksSync(5);
@@ -361,7 +371,8 @@ public sealed partial class MindTests
await pair.RunTicksSync(5);
EntityUid mob = default!;
Mind mobMind = default!;
EntityUid mobMindId = default!;
MindComponent mobMind = default!;
await server.WaitAssertion(() =>
{
@@ -370,22 +381,25 @@ public sealed partial class MindTests
mob = entMan.SpawnEntity(null, new MapCoordinates());
MakeSentientCommand.MakeSentient(mob, IoCManager.Resolve<IEntityManager>());
mobMind = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
mobMindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
mobMind = entMan.GetComponent<MindComponent>(mobMindId);
mindSystem.SetUserId(mobMind, player.UserId);
mindSystem.TransferTo(mobMind, mob);
mindSystem.SetUserId(mobMindId, player.UserId);
mindSystem.TransferTo(mobMindId, mob);
});
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
var m = player.ContentData()?.Mind;
Assert.That(m, Is.Not.Null);
var mId = player.ContentData()?.Mind!.Value;
Assert.That(mId, Is.Not.Null);
Assert.That(mId, Is.Not.EqualTo(default(EntityUid)));
var m = entMan.GetComponent<MindComponent>(mId!.Value);
Assert.Multiple(() =>
{
Assert.That(m!.OwnedEntity, Is.EqualTo(mob));
Assert.That(m, Is.Not.EqualTo(mind));
Assert.That(mId, Is.Not.EqualTo(mindId));
});
});
@@ -416,7 +430,8 @@ public sealed partial class MindTests
//EntityUid entity = default!;
EntityUid ghostRole = default!;
EntityUid ghost = default!;
Mind mind = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.ServerSessions.Single();
await server.WaitAssertion(() =>
@@ -434,7 +449,8 @@ public sealed partial class MindTests
var data = player.ContentData();
Assert.That(data?.Mind, Is.Not.EqualTo(null));
mind = data!.Mind!;
mindId = data!.Mind!.Value;
mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mind.OwnedEntity, Is.Not.Null);
@@ -460,8 +476,8 @@ public sealed partial class MindTests
await server.WaitAssertion(() =>
{
var data = player.ContentData()!;
Assert.That(data.Mind!.OwnedEntity, Is.EqualTo(ghostRole));
var data = entMan.GetComponent<MindComponent>(player.ContentData()!.Mind!.Value);
Assert.That(data.OwnedEntity, Is.EqualTo(ghostRole));
serverConsole.ExecuteCommand(player, "aghost");
Assert.That(player.AttachedEntity, Is.Not.Null);