using System.Linq;
using System.Threading.Tasks;
using Content.Server.Mind;
+using Content.Shared.Coordinates;
using NUnit.Framework;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Map;
using Robust.Shared.Maths;
-namespace Content.IntegrationTests.Tests.Minds
+namespace Content.IntegrationTests.Tests
{
// Tests various scenarios of deleting the entity that a player's mind is connected to.
[TestFixture]
var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
EntityUid playerEnt = default;
EntityUid visitEnt = default;
Mind mind = null;
playerEnt = entMan.SpawnEntity(null, pos);
visitEnt = entMan.SpawnEntity(null, pos);
- mind = mindSystem.CreateMind(player.UserId);
- mindSystem.TransferTo(mind, playerEnt);
- mindSystem.Visit(mind, visitEnt);
+ mind = new Mind(player.UserId);
+ mind.ChangeOwningPlayer(player.UserId);
+
+ mind.TransferTo(playerEnt);
+ mind.Visit(visitEnt);
Assert.That(player.AttachedEntity, Is.EqualTo(visitEnt));
Assert.That(mind.VisitingEntity, Is.EqualTo(visitEnt));
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
-
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
var map = await PoolManager.CreateTestMap(pairTracker);
EntityUid playerEnt = default;
playerEnt = entMan.SpawnEntity(null, pos);
- mind = mindSystem.CreateMind(player.UserId);
- mindSystem.TransferTo(mind, playerEnt);
+ mind = new Mind(player.UserId);
+ mind.ChangeOwningPlayer(player.UserId);
+
+ mind.TransferTo(playerEnt);
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
[Test]
public async Task TestGhostOnDeleteMap()
{
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
+ await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
var testMap = await PoolManager.CreateTestMap(pairTracker);
var coordinates = testMap.GridCoords;
var entMan = server.ResolveDependency<IServerEntityManager>();
+ var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
-
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
var map = await PoolManager.CreateTestMap(pairTracker);
EntityUid playerEnt = default;
Mind mind = null;
await server.WaitAssertion(() =>
{
+ var player = playerMan.ServerSessions.Single();
+
playerEnt = entMan.SpawnEntity(null, coordinates);
+ mind = new Mind(player.UserId);
+ mind.ChangeOwningPlayer(player.UserId);
- mind = mindSystem.CreateMind(null);
- mindSystem.TransferTo(mind, playerEnt);
+ mind.TransferTo(playerEnt);
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
+++ /dev/null
-#nullable enable
-using System;
-using System.Threading.Tasks;
-using Content.Server.Mind;
-using Content.Server.Mind.Components;
-using Content.Server.Roles;
-using Content.Server.Traitor;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.Roles;
-using NUnit.Framework;
-using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-
-namespace Content.IntegrationTests.Tests.Minds;
-
-[TestFixture]
-public sealed class MindTests
-{
- private const string Prototypes = @"
-- type: entity
- id: MindTestEntity
- components:
- - type: MindContainer
-
-- type: entity
- parent: MindTestEntity
- id: MindTestEntityDamageable
- components:
- - type: Damageable
- damageContainer: Biological
- - type: Body
- prototype: Human
- requiredLegs: 2
- - type: MobState
- - type: MobThresholds
- thresholds:
- 0: Alive
- 100: Critical
- 200: Dead
- - type: Destructible
- thresholds:
- - trigger:
- !type:DamageTypeTrigger
- damageType: Blunt
- damage: 400
- behaviors:
- - !type:GibBehavior { }
-";
-
- /// <summary>
- /// Exception handling for PlayerData and NetUserId invalid due to testing.
- /// Can be removed when Players can be mocked.
- /// </summary>
- /// <param name="func"></param>
- private void CatchPlayerDataException(Action func)
- {
- try
- {
- func();
- }
- catch (ArgumentException e)
- {
- // Prevent exiting due to PlayerData not being initialized.
- if (e.Message == "New owner must have previously logged into the server. (Parameter 'newOwner')")
- return;
- throw;
- }
- }
-
- [Test]
- public async Task TestCreateAndTransferMindToNewEntity()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
-
- await server.WaitAssertion(() =>
- {
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
- var entity = entMan.SpawnEntity(null, new MapCoordinates());
- var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
-
- var mind = mindSystem.CreateMind(null);
-
- Assert.That(mind.UserId, Is.EqualTo(null));
-
- mindSystem.TransferTo(mind, entity);
- Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
- });
-
- await pairTracker.CleanReturnAsync();
- }
-
- [Test]
- public async Task TestReplaceMind()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
-
- await server.WaitAssertion(() =>
- {
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
- 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 mind2 = mindSystem.CreateMind(null);
- mindSystem.TransferTo(mind2, entity);
- Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind2));
- Assert.That(mind.OwnedEntity != entity);
- });
-
- await pairTracker.CleanReturnAsync();
- }
-
- [Test]
- public async Task TestEntityDeadWhenGibbed()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true, ExtraPrototypes = Prototypes });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
- var protoMan = server.ResolveDependency<IPrototypeManager>();
-
- EntityUid entity = default!;
- MindContainerComponent mindContainerComp = default!;
- Mind mind = default!;
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
- var damageableSystem = entMan.EntitySysManager.GetEntitySystem<DamageableSystem>();
-
- await server.WaitAssertion(() =>
- {
- entity = entMan.SpawnEntity("MindTestEntityDamageable", new MapCoordinates());
- mindContainerComp = entMan.EnsureComponent<MindContainerComponent>(entity);
-
- mind = mindSystem.CreateMind(null);
-
- mindSystem.TransferTo(mind, entity);
- Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
- Assert.That(!mindSystem.IsCharacterDeadPhysically(mind));
- });
-
- await PoolManager.RunTicksSync(pairTracker.Pair, 5);
-
- await server.WaitAssertion(() =>
- {
- var damageable = entMan.GetComponent<DamageableComponent>(entity);
- if (!protoMan.TryIndex<DamageTypePrototype>("Blunt", out var prototype))
- {
- return;
- }
-
- damageableSystem.SetDamage(entity, damageable, new DamageSpecifier(prototype, FixedPoint2.New(401)));
- Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
- });
-
- await PoolManager.RunTicksSync(pairTracker.Pair, 5);
-
- await server.WaitAssertion(() =>
- {
- Assert.That(mindSystem.IsCharacterDeadPhysically(mind));
- });
-
- await pairTracker.CleanReturnAsync();
- }
-
- [Test]
- public async Task TestMindTransfersToOtherEntity()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
-
- await server.WaitAssertion(() =>
- {
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
- var entity = entMan.SpawnEntity(null, new MapCoordinates());
- var targetEntity = entMan.SpawnEntity(null, new MapCoordinates());
- var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
- entMan.EnsureComponent<MindContainerComponent>(targetEntity);
-
- var mind = mindSystem.CreateMind(null);
-
- mindSystem.TransferTo(mind, entity);
-
- Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
-
- mindSystem.TransferTo(mind, targetEntity);
- Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(null));
- Assert.That(mindSystem.GetMind(targetEntity), Is.EqualTo(mind));
- });
-
- await pairTracker.CleanReturnAsync();
- }
-
- [Test]
- public async Task TestOwningPlayerCanBeChanged()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
-
- await server.WaitAssertion(() =>
- {
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
- 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 newUserId = new NetUserId(Guid.NewGuid());
- Assert.That(mindComp.HasMind);
- CatchPlayerDataException(() =>
- mindSystem.ChangeOwningPlayer(mindComp.Mind!, newUserId));
-
- Assert.That(mind.UserId, Is.EqualTo(newUserId));
- });
-
- await pairTracker.CleanReturnAsync();
- }
-
- [Test]
- public async Task TestAddRemoveHasRoles()
- {
- await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{ NoClient = true });
- var server = pairTracker.Pair.Server;
-
- var entMan = server.ResolveDependency<IServerEntityManager>();
-
- await server.WaitAssertion(() =>
- {
- var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
-
- var entity = entMan.SpawnEntity(null, new MapCoordinates());
- var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
-
- var mind = mindSystem.CreateMind(null);
-
- Assert.That(mind.UserId, Is.EqualTo(null));
-
- mindSystem.TransferTo(mind, entity);
- Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
-
- Assert.That(!mindSystem.HasRole<TraitorRole>(mind));
- Assert.That(!mindSystem.HasRole<Job>(mind));
-
- var traitorRole = new TraitorRole(mind, new AntagPrototype());
-
- mindSystem.AddRole(mind, traitorRole);
-
- Assert.That(mindSystem.HasRole<TraitorRole>(mind));
- Assert.That(!mindSystem.HasRole<Job>(mind));
-
- var jobRole = new Job(mind, new JobPrototype());
-
- mindSystem.AddRole(mind, jobRole);
-
- Assert.That(mindSystem.HasRole<TraitorRole>(mind));
- Assert.That(mindSystem.HasRole<Job>(mind));
-
- mindSystem.RemoveRole(mind, traitorRole);
-
- Assert.That(!mindSystem.HasRole<TraitorRole>(mind));
- Assert.That(mindSystem.HasRole<Job>(mind));
-
- mindSystem.RemoveRole(mind, jobRole);
-
- Assert.That(!mindSystem.HasRole<TraitorRole>(mind));
- Assert.That(!mindSystem.HasRole<Job>(mind));
- });
-
- await pairTracker.CleanReturnAsync();
- }
-}
}
// Logging
- _entities.TryGetComponent(player, out MindContainerComponent? mindContainerComponent);
- if (mindContainerComponent != null)
+ _entities.TryGetComponent(player, out MindComponent? mindComponent);
+ if (mindComponent != null)
{
var humanReadableState = _injecting ? "Inject" : "Not inject";
if (msg.Button == UiButton.IncreaseFuel || msg.Button == UiButton.DecreaseFuel)
- _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{_entities.ToPrettyString(mindContainerComponent.Owner):player} has set the AME to inject {InjectionAmount} while set to {humanReadableState}");
+ _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{_entities.ToPrettyString(mindComponent.Owner):player} has set the AME to inject {InjectionAmount} while set to {humanReadableState}");
if (msg.Button == UiButton.ToggleInjection)
- _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{_entities.ToPrettyString(mindContainerComponent.Owner):player} has set the AME to {humanReadableState}");
+ _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{_entities.ToPrettyString(mindComponent.Owner):player} has set the AME to {humanReadableState}");
// Admin alert
if (GetCoreCount() * 2 == InjectionAmount - 2 && msg.Button == UiButton.IncreaseFuel)
- _chat.SendAdminAlert(player, $"increased AME over safe limit to {InjectionAmount}", mindContainerComponent);
+ _chat.SendAdminAlert(player, $"increased AME over safe limit to {InjectionAmount}", mindComponent);
}
GetAMENodeGroup()?.UpdateCoreVisuals();
using Content.Server.GameTicking;
using Content.Server.Ghost.Components;
-using Content.Server.Mind;
using Content.Server.Players;
using Content.Shared.Administration;
using Content.Shared.Ghost;
shell.WriteLine("You can't ghost here!");
return;
}
-
- var mindSystem = _entities.System<MindSystem>();
if (mind.VisitingEntity != default && _entities.HasComponent<GhostComponent>(mind.VisitingEntity))
{
- mindSystem.UnVisit(mind);
+ player.ContentData()!.Mind?.UnVisit();
return;
}
else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
_entities.GetComponent<MetaDataComponent>(ghost).EntityName = mind.Session.Name;
- mindSystem.Visit(mind, ghost);
+ mind.Visit(ghost);
}
else
{
_entities.GetComponent<MetaDataComponent>(ghost).EntityName = player.Name;
- mindSystem.TransferTo(mind, ghost);
+ mind.TransferTo(ghost);
}
var comp = _entities.GetComponent<GhostComponent>(ghost);
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Shared.Administration;
return;
}
- if (!_entities.HasComponent<MindContainerComponent>(target))
+ if (!_entities.HasComponent<MindComponent>(target))
{
shell.WriteLine(Loc.GetString("shell-entity-is-not-mob"));
return;
DebugTools.AssertNotNull(mind);
- var mindSystem = _entities.System<MindSystem>();
- mindSystem.TransferTo(mind!, target);
+ mind!.TransferTo(target);
}
}
}
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Shared.Administration;
[AdminCommand(AdminFlags.Admin)]
sealed class SetMindCommand : IConsoleCommand
{
-
public string Command => "setmind";
- public string Description => Loc.GetString("set-mind-command-description", ("requiredComponent", nameof(MindContainerComponent)));
+ public string Description => Loc.GetString("set-mind-command-description", ("requiredComponent", nameof(MindComponent)));
public string Help => Loc.GetString("set-mind-command-help-text", ("command", Command));
return;
}
- if (!entityManager.HasComponent<MindContainerComponent>(eUid))
+ if (!entityManager.HasComponent<MindComponent>(eUid))
{
shell.WriteLine(Loc.GetString("set-mind-command-target-has-no-mind-message"));
return;
return;
}
- var mindSystem = entityManager.System<MindSystem>();
-
var mind = playerCData.Mind;
if (mind == null)
{
- mind = mindSystem.CreateMind(session.UserId);
- mind.CharacterName = entityManager.GetComponent<MetaDataComponent>(eUid).EntityName;
+ mind = new Mind.Mind(session.UserId)
+ {
+ CharacterName = entityManager.GetComponent<MetaDataComponent>(eUid).EntityName
+ };
+ mind.ChangeOwningPlayer(session.UserId);
}
-
- mindSystem.TransferTo(mind, eUid);
+ mind.TransferTo(eUid);
}
}
}
if (!_adminManager.HasAdminFlag(player, AdminFlags.Fun))
return;
- var targetHasMind = TryComp(args.Target, out MindContainerComponent? targetMindComp);
+ var targetHasMind = TryComp(args.Target, out MindComponent? targetMindComp);
if (!targetHasMind || targetMindComp == null)
return;
Icon = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/Structures/Wallmounts/signs.rsi"), "bio"),
Act = () =>
{
- TryComp(args.Target, out MindContainerComponent? mindComp);
+ TryComp(args.Target, out MindComponent? mindComp);
if (mindComp == null || mindComp.Mind == null)
return;
using Content.Server.Disposal.Tube.Components;
using Content.Server.EUI;
using Content.Server.Ghost.Roles;
-using Content.Server.Mind;
using Content.Server.Mind.Commands;
using Content.Server.Mind.Components;
using Content.Server.Players;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly PrayerSystem _prayerSystem = default!;
[Dependency] private readonly EuiManager _eui = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
private readonly Dictionary<IPlayerSession, EditSolutionsEui> _openSolutionUis = new();
Act = () =>
{
MakeSentientCommand.MakeSentient(args.Target, EntityManager);
-
- var mind = player.ContentData()?.Mind;
- if (mind == null)
- return;
-
- _mindSystem.TransferTo(mind, args.Target, ghostCheckOverride: true);
+ player.ContentData()?.Mind?.TransferTo(args.Target, ghostCheckOverride: true);
},
Impact = LogImpact.High,
ConfirmationPopup = true
// Make Sentient verb
if (_groupController.CanCommand(player, "makesentient") &&
args.User != args.Target &&
- !EntityManager.HasComponent<MindContainerComponent>(args.Target))
+ !EntityManager.HasComponent<MindComponent>(args.Target))
{
Verb verb = new()
{
// Make ghost role verb
if (_groupController.CanCommand(player, "makeghostrole") &&
- !(EntityManager.GetComponentOrNull<MindContainerComponent>(args.Target)?.HasMind ?? false))
+ !(EntityManager.GetComponentOrNull<MindComponent>(args.Target)?.HasMind ?? false))
{
Verb verb = new();
verb.Text = Loc.GetString("make-ghost-role-verb-get-data-text");
using Content.Server.GameTicking;
using Content.Server.Humanoid;
using Content.Server.Kitchen.Components;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
[Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public override void Initialize()
{
private void OnRelayMoveInput(EntityUid uid, BodyComponent component, ref MoveInputEvent args)
{
- if (_mobState.IsDead(uid) && _mindSystem.TryGetMind(uid, out var mind))
+ if (_mobState.IsDead(uid) &&
+ EntityManager.TryGetComponent<MindComponent>(uid, out var mind) &&
+ mind.HasMind)
{
- if (!mind.TimeOfDeath.HasValue)
+ if (!mind.Mind!.TimeOfDeath.HasValue)
{
- mind.TimeOfDeath = _gameTiming.RealTime;
+ mind.Mind.TimeOfDeath = _gameTiming.RealTime;
}
- _ticker.OnGhostAttempt(mind, true);
+ _ticker.OnGhostAttempt(mind.Mind!, true);
}
}
using Content.Server.Body.Components;
using Content.Server.Ghost.Components;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Shared.Body.Components;
using Content.Shared.Body.Events;
{
public sealed class BrainSystem : EntitySystem
{
- [Dependency] private readonly MindSystem _mindSystem = default!;
-
public override void Initialize()
{
base.Initialize();
private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
{
- EntityManager.EnsureComponent<MindContainerComponent>(newEntity);
- var oldMind = EntityManager.EnsureComponent<MindContainerComponent>(oldEntity);
+ EntityManager.EnsureComponent<MindComponent>(newEntity);
+ var oldMind = EntityManager.EnsureComponent<MindComponent>(oldEntity);
EnsureComp<GhostOnMoveComponent>(newEntity);
if (HasComp<BodyComponent>(newEntity))
// TODO: This is an awful solution.
EnsureComp<InputMoverComponent>(newEntity);
- if (!_mindSystem.TryGetMind(oldEntity, out var mind, oldMind))
- return;
-
- _mindSystem.TransferTo(mind, newEntity);
+ oldMind.Mind?.TransferTo(newEntity);
}
}
}
using System.Linq;
using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.Power.Components;
using Content.Shared.Tag;
{
return input.Where(e =>
{
- if (entityManager.TryGetComponent<MindContainerComponent>(e, out var mind))
+ if (entityManager.TryGetComponent<MindComponent>(e, out var mind))
return (mind.Mind?.VisitingEntity == e) ^ isInverted;
return isInverted;
{
return DoSelection(
- entityManager.EntityQuery<MindContainerComponent>().Select(x => x.Owner),
+ entityManager.EntityQuery<MindComponent>().Select(x => x.Owner),
arguments, isInverted, entityManager);
}
}
public override IEnumerable<EntityUid> DoSelection(IEnumerable<EntityUid> input, IReadOnlyList<object> arguments, bool isInverted, IEntityManager entityManager)
{
- var mindSystem = entityManager.System<MindSystem>();
return input.Where(e =>
- entityManager.TryGetComponent<MindContainerComponent>(e, out var mind)
- && mind.Mind != null
- && !mindSystem.IsCharacterDeadPhysically(mind.Mind));
+ (entityManager.TryGetComponent<MindComponent>(e, out var mind) &&
+ !(mind.Mind?.CharacterDeadPhysically ?? false)) ^ isInverted);
}
public override IEnumerable<EntityUid> DoInitialSelection(IReadOnlyList<object> arguments, bool isInverted, IEntityManager entityManager)
{
- return DoSelection(entityManager.EntityQuery<MindContainerComponent>().Select(x => x.Owner), arguments,
+ return DoSelection(entityManager.EntityQuery<MindComponent>().Select(x => x.Owner), arguments,
isInverted, entityManager);
}
}
var conditions = new Dictionary<string, List<ConditionInfo>>();
var jobTitle = "No Profession";
var briefing = "!!ERROR: No Briefing!!"; //should never show on the UI unless there's a bug
- if (EntityManager.TryGetComponent(entity, out MindContainerComponent? mindContainerComponent) && mindContainerComponent.Mind != null)
+ if (EntityManager.TryGetComponent(entity, out MindComponent? mindComponent) && mindComponent.Mind != null)
{
- var mind = mindContainerComponent.Mind;
+ var mind = mindComponent.Mind;
// Get objectives
foreach (var objective in mind.AllObjectives)
var mind = player.ContentData()?.Mind;
// This check also proves mind not-null for at the end when the mob is ghosted.
- if (mind?.OwnedEntity is not { Valid: true } victim)
+ if (mind?.OwnedComponent?.Owner is not { Valid: true } victim)
{
shell.WriteLine("You don't have a mind!");
return;
ChatMessageToMany(ChatChannel.AdminAlert, message, wrappedMessage, default, false, true, clients);
}
- public void SendAdminAlert(EntityUid player, string message, MindContainerComponent? mindContainerComponent = null)
+ public void SendAdminAlert(EntityUid player, string message, MindComponent? mindComponent = null)
{
- if(mindContainerComponent == null && !_entityManager.TryGetComponent(player, out mindContainerComponent))
+ if(mindComponent == null && !_entityManager.TryGetComponent(player, out mindComponent))
{
SendAdminAlert(message);
return;
}
var adminSystem = _entityManager.System<AdminSystem>();
- var antag = mindContainerComponent.Mind!.UserId != null
- && (adminSystem.GetCachedPlayerInfo(mindContainerComponent.Mind!.UserId.Value)?.Antag ?? false);
+ var antag = mindComponent.Mind!.UserId != null
+ && (adminSystem.GetCachedPlayerInfo(mindComponent.Mind!.UserId.Value)?.Antag ?? false);
- SendAdminAlert($"{mindContainerComponent.Mind!.Session?.Name}{(antag ? " (ANTAG)" : "")} {message}");
+ SendAdminAlert($"{mindComponent.Mind!.Session?.Name}{(antag ? " (ANTAG)" : "")} {message}");
}
public void SendHookOOC(string sender, string message)
void SendHookOOC(string sender, string message);
void SendAdminAnnouncement(string message);
void SendAdminAlert(string message);
- void SendAdminAlert(EntityUid player, string message, MindContainerComponent? mindContainerComponent = null);
+ void SendAdminAlert(EntityUid player, string message, MindComponent? mindComponent = null);
void ChatMessageToOne(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat,
INetChannel client, Color? colorOverride = null, bool recordReplay = false, string? audioPath = null, float audioVolume = 0);
if (player == null)
return true;
- var mindContainerComponent = player.ContentData()?.Mind;
+ var mindComponent = player.ContentData()?.Mind;
- if (mindContainerComponent == null)
+ if (mindComponent == null)
{
shell?.WriteError("You don't have a mind!");
return false;
var entityManager = args.EntityManager;
var uid = args.SolutionEntity;
- // This makes it so it doesn't affect things that are already sentient
- if (entityManager.HasComponent<MindContainerComponent>(uid))
- {
- return;
- }
-
// This piece of code makes things able to speak "normally". One thing of note is that monkeys have a unique accent and won't be affected by this.
entityManager.RemoveComponent<ReplacementAccentComponent>(uid);
entityManager.RemoveComponent<MonkeyAccentComponent>(uid);
// This makes it so it doesn't add a ghost role to things that are already sentient
- if (entityManager.HasComponent<MindContainerComponent>(uid))
+ if (entityManager.HasComponent<MindComponent>(uid))
{
return;
}
if (body is null)
return;
- if (!TryComp<MindContainerComponent>(body, out var mindComp))
+ if (!TryComp<MindComponent>(body, out var mindComp))
return;
var mind = mindComp.Mind;
{
scanBodyInfo = MetaData(scanBody.Value).EntityName;
- TryComp<MindContainerComponent>(scanBody, out var mindComp);
+ TryComp<MindComponent>(scanBody, out var mindComp);
if (!_mobStateSystem.IsDead(scanBody.Value))
{
using Content.Server.Materials;
using Content.Server.Stack;
using Content.Server.Jobs;
-using Content.Server.Mind;
using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Prototypes;
using Content.Shared.Zombies;
[Dependency] private readonly ChatSystem _chatSystem = default!;
[Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] private readonly MaterialStorageSystem _material = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public readonly Dictionary<Mind.Mind, EntityUid> ClonesWaitingForMind = new();
public const float EasyModeCloningCost = 0.7f;
{
if (!ClonesWaitingForMind.TryGetValue(mind, out var entity) ||
!EntityManager.EntityExists(entity) ||
- !TryComp<MindContainerComponent>(entity, out var mindComp) ||
+ !TryComp<MindComponent>(entity, out var mindComp) ||
mindComp.Mind != null)
return;
- _mindSystem.TransferTo(mind, entity, ghostCheckOverride: true);
- _mindSystem.UnVisit(mind);
+ mind.TransferTo(entity, ghostCheckOverride: true);
+ mind.UnVisit();
ClonesWaitingForMind.Remove(mind);
}
{
if (EntityManager.EntityExists(clone) &&
!_mobStateSystem.IsDead(clone) &&
- TryComp<MindContainerComponent>(clone, out var cloneMindComp) &&
+ TryComp<MindComponent>(clone, out var cloneMindComp) &&
(cloneMindComp.Mind == null || cloneMindComp.Mind == mind))
return false; // Mind already has clone
private void OnExamined(EntityUid uid, DroneComponent component, ExaminedEvent args)
{
- if (TryComp<MindContainerComponent>(uid, out var mind) && mind.HasMind)
+ if (TryComp<MindComponent>(uid, out var mind) && mind.HasMind)
{
args.PushMarkup(Loc.GetString("drone-active"));
}
foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, component.InteractionBlockRange))
{
// Return true if the entity is/was controlled by a player and is not a drone or ghost.
- if (HasComp<MindContainerComponent>(entity) && !HasComp<DroneComponent>(entity) && !HasComp<GhostComponent>(entity))
+ if (HasComp<MindComponent>(entity) && !HasComp<DroneComponent>(entity) && !HasComp<GhostComponent>(entity))
{
// Filter out dead ghost roles. Dead normal players are intended to block.
if ((TryComp<MobStateComponent>(entity, out var entityMobState) && HasComp<GhostTakeoverAvailableComponent>(entity) && _mobStateSystem.IsDead(entity, entityMobState)))
{
// no damage-dict multiplication required.
_damageableSystem.TryChangeDamage(uid, damage, ignoreResistances: true, damageable: damageable);
- if (HasComp<MindContainerComponent>(uid) || HasComp<ExplosiveComponent>(uid))
+ if (HasComp<MindComponent>(uid) || HasComp<ExplosiveComponent>(uid))
{
var damageStr = string.Join(", ", damage.DamageDict.Select(entry => $"{entry.Key}: {entry.Value}"));
_adminLogger.Add(LogType.Explosion, LogImpact.Medium,
{
var appliedDamage = damage * ev.DamageCoefficient;
_damageableSystem.TryChangeDamage(uid, appliedDamage, ignoreResistances: true, damageable: damageable);
- if (HasComp<MindContainerComponent>(uid) || HasComp<ExplosiveComponent>(uid))
+ if (HasComp<MindComponent>(uid) || HasComp<ExplosiveComponent>(uid))
{
var damageStr = string.Join(", ", appliedDamage.DamageDict.Select(entry => $"{entry.Key}: {entry.Value}"));
_adminLogger.Add(LogType.Explosion, LogImpact.Medium,
using Content.Server.GameTicking.Presets;
using Content.Server.GameTicking.Rules;
using Content.Server.Ghost.Components;
-using Content.Server.Mind;
using Content.Shared.CCVar;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
public const float PresetFailedCooldownIncrease = 30f;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public GamePresetPrototype? Preset { get; private set; }
if (mind.VisitingEntity != default)
{
- _mindSystem.UnVisit(mind);
+ mind.UnVisit();
}
var position = playerEntity is {Valid: true}
// + If we're in a mob that is critical, and we're supposed to be able to return if possible,
// we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK.
// (If the mob survives, that's a bug. Ghosting is kept regardless.)
- var canReturn = canReturnGlobal && _mindSystem.IsCharacterDeadPhysically(mind);
+ var canReturn = canReturnGlobal && mind.CharacterDeadPhysically;
if (canReturnGlobal && TryComp(playerEntity, out MobStateComponent? mobState))
{
_ghosts.SetCanReturnToBody(ghostComponent, canReturn);
if (canReturn)
- _mindSystem.Visit(mind, ghost);
+ mind.Visit(ghost);
else
- _mindSystem.TransferTo(mind, ghost);
+ mind.TransferTo(ghost);
return true;
}
using Robust.Shared.Enums;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
-using PlayerData = Content.Server.Players.PlayerData;
namespace Content.Server.GameTicking
{
using System.Threading.Tasks;
using Content.Shared.Database;
using Robust.Shared.Asynchronous;
-using PlayerData = Content.Server.Players.PlayerData;
namespace Content.Server.GameTicking
{
var connected = false;
var observer = mind.AllRoles.Any(role => role is ObserverRole);
// Continuing
- if (userId != null && _playerManager.ValidSessionId(userId.Value))
+ if (_playerManager.TryGetSessionById(userId, out var ply))
{
connected = true;
}
PlayerData? contentPlayerData = null;
- if (userId != null && _playerManager.TryGetPlayerData(userId.Value, out var playerData))
+ if (_playerManager.TryGetPlayerData(userId, out var playerData))
{
contentPlayerData = playerData.ContentData();
}
DebugTools.AssertNotNull(data);
data!.WipeMind();
- var newMind = _mindSystem.CreateMind(data.UserId, character.Name);
- _mindSystem.ChangeOwningPlayer(newMind, data.UserId);
+ var newMind = new Mind.Mind(data.UserId)
+ {
+ CharacterName = character.Name
+ };
+ newMind.ChangeOwningPlayer(data.UserId);
var jobPrototype = _prototypeManager.Index<JobPrototype>(jobId);
var job = new Job(newMind, jobPrototype);
- _mindSystem.AddRole(newMind, job);
+ newMind.AddRole(job);
_playTimeTrackings.PlayerRolesChanged(player);
DebugTools.AssertNotNull(mobMaybe);
var mob = mobMaybe!.Value;
- _mindSystem.TransferTo(newMind, mob);
+ newMind.TransferTo(mob);
if (lateJoin)
{
DebugTools.AssertNotNull(data);
data!.WipeMind();
- var newMind = _mindSystem.CreateMind(data.UserId);
- _mindSystem.ChangeOwningPlayer(newMind, data.UserId);
- _mindSystem.AddRole(newMind, new ObserverRole(newMind));
+ var newMind = new Mind.Mind(data.UserId);
+ newMind.ChangeOwningPlayer(data.UserId);
+ newMind.AddRole(new ObserverRole(newMind));
var mob = SpawnObserverMob();
EntityManager.GetComponent<MetaDataComponent>(mob).EntityName = name;
var ghost = EntityManager.GetComponent<GhostComponent>(mob);
EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(ghost, false);
- _mindSystem.TransferTo(newMind, mob);
+ newMind.TransferTo(mob);
_playerGameStatuses[player.UserId] = PlayerGameStatus.JoinedGame;
RaiseNetworkEvent(GetStatusSingle(player, PlayerGameStatus.JoinedGame));
using Content.Server.Ghost.Roles.Components;
using Content.Server.Ghost.Roles.Events;
using Content.Server.Humanoid;
-using Content.Server.Humanoid.Systems;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.NPC.Systems;
using Content.Server.Nuke;
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly MapLoaderSystem _map = default!;
[Dependency] private readonly ShuttleSystem _shuttle = default!;
- [Dependency] private readonly RandomHumanoidSystem _randomHumanoid = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
+
private enum WinType
{
private void OnComponentInit(EntityUid uid, NukeOperativeComponent component, ComponentInit args)
{
// If entity has a prior mind attached, add them to the players list.
- if (!TryComp<MindContainerComponent>(uid, out var mindContainerComponent) || !RuleAdded)
+ if (!TryComp<MindComponent>(uid, out var mindComponent) || !RuleAdded)
return;
- var session = mindContainerComponent.Mind?.Session;
+ var session = mindComponent.Mind?.Session;
var name = MetaData(uid).EntityName;
if (session != null)
_operativePlayers.Add(name, session);
private void OnMindAdded(EntityUid uid, NukeOperativeComponent component, MindAddedMessage args)
{
- if (!TryComp<MindContainerComponent>(uid, out var mindContainerComponent) || mindContainerComponent.Mind == null)
+ if (!TryComp<MindComponent>(uid, out var mindComponent) || mindComponent.Mind == null)
return;
- var mind = mindContainerComponent.Mind;
+ var mind = mindComponent.Mind;
if (_operativeMindPendingData.TryGetValue(uid, out var role))
{
- _mindSystem.AddRole(mind, new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(role)));
+ mind.AddRole(new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(role)));
_operativeMindPendingData.Remove(uid);
}
- if (!_mindSystem.TryGetSession(mind, out var playerSession))
+ if (!mind.TryGetSession(out var playerSession))
return;
if (_operativePlayers.ContainsValue(playerSession))
return;
var mob = EntityManager.SpawnEntity(species.Prototype, _random.Pick(spawns));
SetupOperativeEntity(mob, spawnDetails.Name, spawnDetails.Gear, profile);
- var newMind = _mindSystem.CreateMind(session.UserId, spawnDetails.Name);
- _mindSystem.ChangeOwningPlayer(newMind, session.UserId);
- _mindSystem.AddRole(newMind, new TraitorRole(newMind, nukeOpsAntag));
+ var newMind = new Mind.Mind(session.UserId)
+ {
+ CharacterName = spawnDetails.Name
+ };
+ newMind.ChangeOwningPlayer(session.UserId);
+ newMind.AddRole(new TraitorRole(newMind, nukeOpsAntag));
- _mindSystem.TransferTo(newMind, mob);
+ newMind.TransferTo(mob);
}
else if (addSpawnPoints)
{
if (!mind.OwnedEntity.HasValue)
return;
- _mindSystem.AddRole(mind, new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(_nukeopsRuleConfig.OperativeRoleProto)));
+ mind.AddRole(new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(_nukeopsRuleConfig.OperativeRoleProto)));
SetOutfitCommand.SetOutfit(mind.OwnedEntity.Value, "SyndicateOperativeGearFull", EntityManager);
}
}
// Add pre-existing nuke operatives to the credit list.
- var query = EntityQuery<NukeOperativeComponent, MindContainerComponent>(true);
+ var query = EntityQuery<NukeOperativeComponent, MindComponent>(true);
foreach (var (_, mindComp) in query)
{
- if (!mindComp.HasMind || !_mindSystem.TryGetSession(mindComp.Mind, out var session))
+ if (mindComp.Mind == null || !mindComp.Mind.TryGetSession(out var session))
continue;
var name = MetaData(mindComp.Owner).EntityName;
_operativePlayers.Add(name, session);
using Content.Server.Administration.Commands;
using Content.Server.Cargo.Systems;
using Content.Server.Chat.Managers;
-using Content.Server.Mind;
using Content.Server.Preferences.Managers;
using Content.Server.Spawners.Components;
using Content.Server.Station.Components;
[Dependency] private readonly PricingSystem _pricingSystem = default!;
[Dependency] private readonly MapLoaderSystem _map = default!;
[Dependency] private readonly NamingSystem _namingSystem = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
[ViewVariables]
private List<Mind.Mind> _pirates = new();
var name = _namingSystem.GetName("Human", gender);
var session = ops[i];
- var newMind = _mindSystem.CreateMind(session.UserId, name);
- _mindSystem.ChangeOwningPlayer(newMind, session.UserId);
+ var newMind = new Mind.Mind(session.UserId)
+ {
+ CharacterName = name
+ };
+ newMind.ChangeOwningPlayer(session.UserId);
var mob = Spawn("MobHuman", _random.Pick(spawns));
MetaData(mob).EntityName = name;
- _mindSystem.TransferTo(newMind, mob);
+ newMind.TransferTo(mob);
var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile;
_stationSpawningSystem.EquipStartingGear(mob, pirateGear, profile);
using System.Threading;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking.Rules.Configurations;
-using Content.Server.Mind;
using Content.Server.Players;
using Content.Server.Roles;
using Content.Server.Station.Components;
[Dependency] private readonly SharedDoorSystem _doorSystem = default!;
[Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
[Dependency] private readonly UplinkSystem _uplink = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public override string Prototype => "Suspicion";
DebugTools.AssertNotNull(mind?.OwnedEntity);
var traitorRole = new SuspicionTraitorRole(mind!, antagPrototype);
- _mindSystem.AddRole(mind!, traitorRole);
+ mind!.AddRole(traitorRole);
traitors.Add(traitorRole);
// try to place uplink
- _uplink.AddUplink(mind!.OwnedEntity!.Value, traitorStartingBalance);
+ _uplink.AddUplink(mind.OwnedEntity!.Value, traitorStartingBalance);
}
foreach (var player in list)
DebugTools.AssertNotNull(mind);
- _mindSystem.AddRole(mind!, new SuspicionInnocentRole(mind!, antagPrototype));
+ mind!.AddRole(new SuspicionInnocentRole(mind, antagPrototype));
}
foreach (var traitor in traitors)
_chatManager.DispatchServerAnnouncement(Loc.GetString("rule-suspicion-added-announcement"));
- var filter = Filter.Empty().AddWhere(session =>
- {
- var mind = ((IPlayerSession) session).ContentData()?.Mind;
- return mind != null && _mindSystem.HasRole<SuspicionTraitorRole>(mind);
- });
+ var filter = Filter.Empty()
+ .AddWhere(session => ((IPlayerSession) session).ContentData()?.Mind?.HasRole<SuspicionTraitorRole>() ?? false);
SoundSystem.Play(_addedSound.GetSound(), filter, AudioParams.Default);
var mind = playerSession.ContentData()?.Mind;
- if (mind != null && _mindSystem.HasRole<SuspicionTraitorRole>(mind))
+ if (mind != null && mind.HasRole<SuspicionTraitorRole>())
traitorsAlive++;
else
innocentsAlive++;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking.Rules.Configurations;
using Content.Server.Hands.Components;
-using Content.Server.Mind;
using Content.Server.PDA;
using Content.Server.Players;
using Content.Server.Spawners.Components;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly UplinkSystem _uplink = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public override string Prototype => "TraitorDeathMatch";
var antagPrototype = _prototypeManager.Index<AntagPrototype>(TraitorPrototypeID);
var traitorRole = new TraitorRole(mind, antagPrototype);
- _mindSystem.AddRole(mind, traitorRole);
+ mind.AddRole(traitorRole);
// Delete anything that may contain "dangerous" role-specific items.
// (This includes the PDA, as everybody gets the captain PDA in this mode for true-all-access reasons.)
using System.Linq;
using Content.Server.Chat.Managers;
-using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Server.Players;
using Content.Server.Roles;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly UplinkSystem _uplink = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
private ISawmill _sawmill = default!;
var antagPrototype = _prototypeManager.Index<AntagPrototype>(TraitorPrototypeID);
var traitorRole = new TraitorRole(mind, antagPrototype);
- _mindSystem.AddRole(mind, traitorRole);
+ mind.AddRole(traitorRole);
Traitors.Add(traitorRole);
traitorRole.GreetTraitor(Codewords);
{
var objective = _objectivesManager.GetRandomObjective(traitorRole.Mind, "TraitorObjectiveGroups");
if (objective == null) continue;
- if (_mindSystem.TryAddObjective(traitorRole.Mind, objective))
+ if (traitorRole.Mind.TryAddObjective(objective))
difficulty += objective.Difficulty;
}
foreach (var traitor in Traitors)
{
var name = traitor.Mind.CharacterName;
- _mindSystem.TryGetSession(traitor.Mind, out var session);
+ traitor.Mind.TryGetSession(out var session);
var username = session?.Name;
var objectives = traitor.Mind.AllObjectives.ToArray();
using Content.Server.Disease;
using Content.Server.Disease.Components;
using Content.Server.Humanoid;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Server.Popups;
[Dependency] private readonly ActionsSystem _action = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
private Dictionary<string, string> _initialInfectedNames = new();
{
var meta = MetaData(survivor);
var username = string.Empty;
- if (TryComp<MindContainerComponent>(survivor, out var mindcomp))
+ if (TryComp<MindComponent>(survivor, out var mindcomp))
if (mindcomp.Mind != null && mindcomp.Mind.Session != null)
username = mindcomp.Mind.Session.Name;
DebugTools.AssertNotNull(mind.OwnedEntity);
- _mindSystem.AddRole(mind, new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(PatientZeroPrototypeID)));
+ mind.AddRole(new TraitorRole(mind, _prototypeManager.Index<AntagPrototype>(PatientZeroPrototypeID)));
var inCharacterName = string.Empty;
if (mind.OwnedEntity != null)
if (EntityManager.HasComponent<VisitingMindComponent>(uid))
return;
- if (!EntityManager.TryGetComponent<MindContainerComponent>(uid, out var mind) || !mind.HasMind || mind.Mind.IsVisitingEntity)
+ if (!EntityManager.TryGetComponent<MindComponent>(uid, out var mind) || !mind.HasMind || mind.Mind!.IsVisitingEntity)
return;
if (component.MustBeDead && (_mobState.IsAlive(uid) || _mobState.IsCritical(uid)))
return;
- _ticker.OnGhostAttempt(mind.Mind, component.CanReturn);
+ _ticker.OnGhostAttempt(mind.Mind!, component.CanReturn);
}
private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentStartup args)
return;
}
- _mindSystem.UnVisit(actor.PlayerSession.ContentData()!.Mind);
+ actor.PlayerSession.ContentData()!.Mind?.UnVisit();
}
private void OnGhostWarpToTargetRequest(GhostWarpToTargetRequestEvent msg, EntitySessionEventArgs args)
if (Deleted(uid) || Terminating(uid))
return;
- if (EntityManager.TryGetComponent<MindContainerComponent?>(uid, out var mind))
+ if (EntityManager.TryGetComponent<MindComponent?>(uid, out var mind))
_mindSystem.SetGhostOnShutdown(uid, false, mind);
EntityManager.DeleteEntity(uid);
}
{
if (attached == except) continue;
- TryComp<MindContainerComponent>(attached, out var mind);
+ TryComp<MindComponent>(attached, out var mind);
string playerInfo = $"{EntityManager.GetComponent<MetaDataComponent>(attached).EntityName} ({mind?.Mind?.CurrentJob?.Name ?? "Unknown"})";
if (MakeSentient)
MakeSentientCommand.MakeSentient(mob, _entMan, AllowMovement, AllowSpeech);
- mob.EnsureComponent<MindContainerComponent>();
+ mob.EnsureComponent<MindComponent>();
var ghostRoleSystem = EntitySystem.Get<GhostRoleSystem>();
ghostRoleSystem.GhostRoleInternalCreateMindAndTransfer(session, Owner, mob, this);
Taken = true;
- var mind = Owner.EnsureComponent<MindContainerComponent>();
+ var mind = Owner.EnsureComponent<MindComponent>();
if (mind.HasMind)
return false;
using Content.Server.Ghost.Components;
using Content.Server.Ghost.Roles.Components;
using Content.Server.Ghost.Roles.UI;
-using Content.Server.Mind;
using Content.Server.Mind.Components;
using Content.Server.Players;
using Content.Shared.Administration;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly FollowerSystem _followerSystem = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
private uint _nextRoleIdentifier;
private bool _needsUpdateGhostRoleCount = true;
DebugTools.AssertNotNull(contentData);
- var newMind = _mindSystem.CreateMind(player.UserId,
- EntityManager.GetComponent<MetaDataComponent>(mob).EntityName);
- _mindSystem.AddRole(newMind, new GhostRoleMarkerRole(newMind, role.RoleName));
+ var newMind = new Mind.Mind(player.UserId)
+ {
+ CharacterName = EntityManager.GetComponent<MetaDataComponent>(mob).EntityName
+ };
+ newMind.AddRole(new GhostRoleMarkerRole(newMind, role.RoleName));
- _mindSystem.ChangeOwningPlayer(newMind, player.UserId);
- _mindSystem.TransferTo(newMind, mob);
+ newMind.ChangeOwningPlayer(player.UserId);
+ newMind.TransferTo(mob);
}
public GhostRoleInfo[] GetGhostRolesInfo()
return;
}
- if (entityManager.TryGetComponent(uid, out MindContainerComponent? mind) &&
+ if (entityManager.TryGetComponent(uid, out MindComponent? mind) &&
mind.HasMind)
{
shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a mind.");
// Reject souled bodies in easy mode.
if (_configManager.GetCVar(CCVars.BiomassEasyMode) &&
HasComp<HumanoidAppearanceComponent>(dragged) &&
- TryComp<MindContainerComponent>(dragged, out var mindComp))
+ TryComp<MindComponent>(dragged, out var mindComp))
{
if (mindComp.Mind?.UserId != null && _playerManager.TryGetSessionById(mindComp.Mind.UserId.Value, out _))
return false;
public static void MakeSentient(EntityUid uid, IEntityManager entityManager, bool allowMovement = true, bool allowSpeech = true)
{
- entityManager.EnsureComponent<MindContainerComponent>(uid);
+ entityManager.EnsureComponent<MindComponent>(uid);
if (allowMovement)
{
entityManager.EnsureComponent<InputMoverComponent>(uid);
}
var builder = new StringBuilder();
- builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedEntity);
+ builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedComponent?.Owner);
foreach (var role in mind.AllRoles)
{
builder.AppendFormat("{0} ", role.Name);
var entSysMan = IoCManager.Resolve<IEntitySystemManager>();
- if (entMan.TryGetComponent(entityUid, out MindContainerComponent? mind) && mind.Mind != null)
+ if (entMan.TryGetComponent(entityUid, out MindComponent? mind) && mind.Mind != null)
{
// Mind
mind.Mind.CharacterName = name;
-using System.Diagnostics.CodeAnalysis;
-using YamlDotNet.Core.Tokens;
-
namespace Content.Server.Mind.Components
{
/// <summary>
/// Stores a <see cref="Server.Mind.Mind"/> on a mob.
/// </summary>
[RegisterComponent, Access(typeof(MindSystem))]
- public sealed class MindContainerComponent : Component
+ public sealed class MindComponent : Component
{
/// <summary>
/// The mind controlling this mob. Can be null.
/// True if we have a mind, false otherwise.
/// </summary>
[ViewVariables]
- [MemberNotNullWhen(true, nameof(Mind))]
public bool HasMind => Mind != null;
/// <summary>
[RegisterComponent]
public sealed class VisitingMindComponent : Component
{
- [ViewVariables]
- public Mind Mind { get; set; } = default!;
+ [ViewVariables] public Mind Mind { get; set; } = default!;
+
+ protected override void OnRemove()
+ {
+ base.OnRemove();
+
+ Mind?.UnVisit();
+ }
}
public sealed class MindUnvisitedMessage : EntityEventArgs
+using System.Diagnostics.CodeAnalysis;
using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Server.GameTicking;
+using Content.Server.Ghost.Components;
using Content.Server.Mind.Components;
using Content.Server.Objectives;
+using Content.Server.Players;
using Content.Server.Roles;
+using Content.Shared.Database;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Network;
+using Robust.Shared.Utility;
namespace Content.Server.Mind
{
/// </remarks>
public sealed class Mind
{
- internal readonly ISet<Role> Roles = new HashSet<Role>();
+ private readonly MobStateSystem _mobStateSystem = default!;
+ private readonly GameTicker _gameTickerSystem = default!;
+ private readonly MindSystem _mindSystem = default!;
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IAdminLogManager _adminLogger = default!;
- internal readonly List<Objective> Objectives = new();
+ private readonly ISet<Role> _roles = new HashSet<Role>();
+
+ private readonly List<Objective> _objectives = new();
public string Briefing = String.Empty;
/// The provided UserId is solely for tracking of intended owner.
/// </summary>
/// <param name="userId">The session ID of the original owner (may get credited).</param>
- public Mind(NetUserId? userId)
+ public Mind(NetUserId userId)
{
OriginalOwnerUserId = userId;
+ IoCManager.InjectDependencies(this);
+ _entityManager.EntitySysManager.Resolve(ref _mobStateSystem);
+ _entityManager.EntitySysManager.Resolve(ref _gameTickerSystem);
+ _entityManager.EntitySysManager.Resolve(ref _mindSystem);
}
+ // TODO: This session should be able to be changed, probably.
/// <summary>
/// The session ID of the player owning this mind.
/// </summary>
[ViewVariables]
- public NetUserId? UserId { get; internal set; }
+ public NetUserId? UserId { get; private set; }
/// <summary>
/// The session ID of the original owner, if any.
/// May end up used for round-end information (as the owner may have abandoned Mind since)
/// </summary>
[ViewVariables]
- public NetUserId? OriginalOwnerUserId { get; }
+ public NetUserId OriginalOwnerUserId { get; }
[ViewVariables]
public bool IsVisitingEntity => VisitingEntity != null;
[ViewVariables]
- public EntityUid? VisitingEntity { get; set; }
+ public EntityUid? VisitingEntity { get; private set; }
- [ViewVariables]
- public EntityUid? CurrentEntity => VisitingEntity ?? OwnedEntity;
+ [ViewVariables] public EntityUid? CurrentEntity => VisitingEntity ?? OwnedEntity;
[ViewVariables(VVAccess.ReadWrite)]
public string? CharacterName { get; set; }
/// Can be null - will be null if the Mind is not considered "dead".
/// </summary>
[ViewVariables]
- public TimeSpan? TimeOfDeath { get; set; }
+ public TimeSpan? TimeOfDeath { get; set; } = null;
/// <summary>
/// The component currently owned by this mind.
/// Can be null.
/// </summary>
[ViewVariables]
- public MindContainerComponent? OwnedComponent { get; internal set; }
+ public MindComponent? OwnedComponent { get; private set; }
/// <summary>
/// The entity currently owned by this mind.
/// Can be null.
/// </summary>
[ViewVariables]
- public EntityUid? OwnedEntity { get; internal set; }
+ public EntityUid? OwnedEntity => OwnedComponent?.Owner;
/// <summary>
/// An enumerable over all the roles this mind has.
/// </summary>
[ViewVariables]
- public IEnumerable<Role> AllRoles => Roles;
+ public IEnumerable<Role> AllRoles => _roles;
/// <summary>
/// An enumerable over all the objectives this mind has.
/// </summary>
[ViewVariables]
- public IEnumerable<Objective> AllObjectives => Objectives;
+ public IEnumerable<Objective> AllObjectives => _objectives;
/// <summary>
/// Prevents user from ghosting out
/// Can be null, in which case the player is currently not logged in.
/// </summary>
[ViewVariables]
- public IPlayerSession? Session { get; internal set; }
+ public IPlayerSession? Session
+ {
+ get
+ {
+ if (!UserId.HasValue)
+ {
+ return null;
+ }
+ _playerManager.TryGetSessionById(UserId.Value, out var ret);
+ return ret;
+ }
+ }
+
+ /// <summary>
+ /// True if this Mind is 'sufficiently dead' IC (objectives, endtext).
+ /// Note that this is *IC logic*, it's not necessarily tied to any specific truth.
+ /// "If administrators decide that zombies are dead, this returns true for zombies."
+ /// (Maybe you were looking for the action blocker system?)
+ /// </summary>
+ [ViewVariables]
+ public bool CharacterDeadIC => CharacterDeadPhysically;
+
+ /// <summary>
+ /// True if the OwnedEntity of this mind is physically dead.
+ /// This specific definition, as opposed to CharacterDeadIC, is used to determine if ghosting should allow return.
+ /// </summary>
+ [ViewVariables]
+ public bool CharacterDeadPhysically
+ {
+ get
+ {
+ // This is written explicitly so that the logic can be understood.
+ // But it's also weird and potentially situational.
+ // Specific considerations when updating this:
+ // + Does being turned into a borg (if/when implemented) count as dead?
+ // *If not, add specific conditions to users of this property where applicable.*
+ // + Is being transformed into a donut 'dead'?
+ // TODO: Consider changing the way ghost roles work.
+ // Mind is an *IC* mind, therefore ghost takeover is IC revival right now.
+ // + Is it necessary to have a reference to a specific 'mind iteration' to cycle when certain events happen?
+ // (If being a borg or AI counts as dead, then this is highly likely, as it's still the same Mind for practical purposes.)
+
+ // This can be null if they're deleted (spike / brain nom)
+ var targetMobState = _entityManager.GetComponentOrNull<MobStateComponent>(OwnedEntity);
+ // This can be null if it's a brain (this happens very often)
+ // Brains are the result of gibbing so should definitely count as dead
+ if (targetMobState == null)
+ return true;
+ // They might actually be alive.
+ return _mobStateSystem.IsDead(OwnedEntity!.Value, targetMobState);
+ }
+ }
+
+ /// <summary>
+ /// A string to represent the mind for logging
+ /// </summary>
+ private string MindOwnerLoggingString
+ {
+ get
+ {
+ if (OwnedEntity != null)
+ return _entityManager.ToPrettyString(OwnedEntity.Value);
+ if (UserId != null)
+ return UserId.Value.ToString();
+ return "(originally " + OriginalOwnerUserId + ")";
+ }
+ }
+
+ /// <summary>
+ /// Gives this mind a new role.
+ /// </summary>
+ /// <param name="role">The type of the role to give.</param>
+ /// <returns>The instance of the role.</returns>
+ /// <exception cref="ArgumentException">
+ /// Thrown if we already have a role with this type.
+ /// </exception>
+ public Role AddRole(Role role)
+ {
+ if (_roles.Contains(role))
+ {
+ throw new ArgumentException($"We already have this role: {role}");
+ }
+
+ _roles.Add(role);
+ role.Greet();
+
+ var message = new RoleAddedEvent(this, role);
+ if (OwnedEntity != null)
+ {
+ _entityManager.EventBus.RaiseLocalEvent(OwnedEntity.Value, message, true);
+ }
+ _adminLogger.Add(LogType.Mind, LogImpact.Low,
+ $"'{role.Name}' added to mind of {MindOwnerLoggingString}");
+
+ return role;
+ }
+
+ /// <summary>
+ /// Removes a role from this mind.
+ /// </summary>
+ /// <param name="role">The type of the role to remove.</param>
+ /// <exception cref="ArgumentException">
+ /// Thrown if we do not have this role.
+ /// </exception>
+ public void RemoveRole(Role role)
+ {
+ if (!_roles.Contains(role))
+ {
+ throw new ArgumentException($"We do not have this role: {role}");
+ }
+
+ _roles.Remove(role);
+
+ var message = new RoleRemovedEvent(this, role);
+
+ if (OwnedEntity != null)
+ {
+ _entityManager.EventBus.RaiseLocalEvent(OwnedEntity.Value, message, true);
+ }
+ _adminLogger.Add(LogType.Mind, LogImpact.Low,
+ $"'{role.Name}' removed from mind of {MindOwnerLoggingString}");
+ }
+
+ public bool HasRole<T>() where T : Role
+ {
+ var t = typeof(T);
+
+ return _roles.Any(role => role.GetType() == t);
+ }
/// <summary>
/// Gets the current job
/// </summary>
- public Job? CurrentJob => Roles.OfType<Job>().SingleOrDefault();
+ public Job? CurrentJob => _roles.OfType<Job>().SingleOrDefault();
+
+ /// <summary>
+ /// Adds an objective to this mind.
+ /// </summary>
+ public bool TryAddObjective(ObjectivePrototype objectivePrototype)
+ {
+ if (!objectivePrototype.CanBeAssigned(this))
+ return false;
+ var objective = objectivePrototype.GetObjective(this);
+ if (_objectives.Contains(objective))
+ return false;
+
+ foreach (var condition in objective.Conditions)
+ _adminLogger.Add(LogType.Mind, LogImpact.Low, $"'{condition.Title}' added to mind of {MindOwnerLoggingString}");
+
+
+ _objectives.Add(objective);
+ return true;
+ }
+
+ /// <summary>
+ /// Removes an objective to this mind.
+ /// </summary>
+ /// <returns>Returns true if the removal succeeded.</returns>
+ public bool TryRemoveObjective(int index)
+ {
+ if (_objectives.Count >= index) return false;
+
+ var objective = _objectives[index];
+
+ foreach (var condition in objective.Conditions)
+ _adminLogger.Add(LogType.Mind, LogImpact.Low, $"'{condition.Title}' removed from the mind of {MindOwnerLoggingString}");
+
+ _objectives.Remove(objective);
+ return true;
+ }
+
+ /// <summary>
+ /// Transfer this mind's control over to a new entity.
+ /// </summary>
+ /// <param name="entity">
+ /// The entity to control.
+ /// Can be null, in which case it will simply detach the mind from any entity.
+ /// </param>
+ /// <param name="ghostCheckOverride">
+ /// If true, skips ghost check for Visiting Entity
+ /// </param>
+ /// <exception cref="ArgumentException">
+ /// Thrown if <paramref name="entity"/> is already owned by another mind.
+ /// </exception>
+ public void TransferTo(EntityUid? entity, bool ghostCheckOverride = false)
+ {
+ // Looks like caller just wants us to go back to normal.
+ if (entity == OwnedEntity)
+ {
+ UnVisit();
+ return;
+ }
+
+ MindComponent? component = null;
+ var alreadyAttached = false;
+
+ if (entity != null)
+ {
+ if (!_entityManager.TryGetComponent(entity.Value, out component))
+ {
+ component = _entityManager.AddComponent<MindComponent>(entity.Value);
+ }
+ else if (component.HasMind)
+ {
+ _gameTickerSystem.OnGhostAttempt(component.Mind!, false);
+ }
+
+ if (_entityManager.TryGetComponent<ActorComponent>(entity.Value, out var actor))
+ {
+ // Happens when transferring to your currently visited entity.
+ if (actor.PlayerSession != Session)
+ {
+ throw new ArgumentException("Visit target already has a session.", nameof(entity));
+ }
+
+ alreadyAttached = true;
+ }
+ }
+
+ if(OwnedComponent != null)
+ _mindSystem.InternalEjectMind(OwnedComponent.Owner, OwnedComponent);
+
+ OwnedComponent = component;
+ if(OwnedComponent != null)
+ _mindSystem.InternalAssignMind(OwnedComponent.Owner, this, OwnedComponent);
+
+ // Don't do the full deletion cleanup if we're transferring to our visitingentity
+ if (alreadyAttached)
+ {
+ // Set VisitingEntity null first so the removal of VisitingMind doesn't get through Unvisit() and delete what we're visiting.
+ // Yes this control flow sucks.
+ VisitingEntity = null;
+ _entityManager.RemoveComponent<VisitingMindComponent>(entity!.Value);
+ }
+ else if (VisitingEntity != null
+ && (ghostCheckOverride // to force mind transfer, for example from ControlMobVerb
+ || !_entityManager.TryGetComponent(VisitingEntity!, out GhostComponent? ghostComponent) // visiting entity is not a Ghost
+ || !ghostComponent.CanReturnToBody)) // it is a ghost, but cannot return to body anyway, so it's okay
+ {
+ RemoveVisitingEntity();
+ }
+
+ // Player is CURRENTLY connected.
+ if (Session != null && !alreadyAttached && VisitingEntity == null)
+ {
+ Session.AttachToEntity(entity);
+ Logger.Info($"Session {Session.Name} transferred to entity {entity}.");
+ }
+ }
+
+ public void ChangeOwningPlayer(NetUserId? newOwner)
+ {
+ var playerMgr = IoCManager.Resolve<IPlayerManager>();
+ PlayerData? newOwnerData = null;
+
+ if (newOwner.HasValue)
+ {
+ if (!playerMgr.TryGetPlayerData(newOwner.Value, out var uncast))
+ {
+ // This restriction is because I'm too lazy to initialize the player data
+ // for a client that hasn't logged in yet.
+ // Go ahead and remove it if you need.
+ throw new ArgumentException("new owner must have previously logged into the server.");
+ }
+
+ newOwnerData = uncast.ContentData();
+ }
+
+ // Make sure to remove control from our old owner if they're logged in.
+ var oldSession = Session;
+ oldSession?.AttachToEntity(null);
+
+ if (UserId.HasValue)
+ {
+ var data = playerMgr.GetPlayerData(UserId.Value).ContentData();
+ DebugTools.AssertNotNull(data);
+ data!.UpdateMindFromMindChangeOwningPlayer(null);
+ }
+
+ UserId = newOwner;
+ if (!newOwner.HasValue)
+ {
+ return;
+ }
+
+ // Yank new owner out of their old mind too.
+ // Can I mention how much I love the word yank?
+ DebugTools.AssertNotNull(newOwnerData);
+ newOwnerData!.Mind?.ChangeOwningPlayer(null);
+ newOwnerData.UpdateMindFromMindChangeOwningPlayer(this);
+ }
+
+ public void Visit(EntityUid entity)
+ {
+ Session?.AttachToEntity(entity);
+ VisitingEntity = entity;
+
+ var comp = _entityManager.AddComponent<VisitingMindComponent>(entity);
+ comp.Mind = this;
+
+ Logger.Info($"Session {Session?.Name} visiting entity {entity}.");
+ }
+
+ /// <summary>
+ /// Returns the mind to its original entity.
+ /// </summary>
+ public void UnVisit()
+ {
+ var currentEntity = Session?.AttachedEntity;
+ Session?.AttachToEntity(OwnedEntity);
+ RemoveVisitingEntity();
+
+ if (Session != null && OwnedEntity != null && currentEntity != OwnedEntity)
+ _adminLogger.Add(LogType.Mind, LogImpact.Low,
+ $"{Session.Name} returned to {_entityManager.ToPrettyString(OwnedEntity.Value)}");
+ }
+
+ /// <summary>
+ /// Cleans up the VisitingEntity.
+ /// </summary>
+ private void RemoveVisitingEntity()
+ {
+ if (VisitingEntity == null)
+ return;
+
+ var oldVisitingEnt = VisitingEntity.Value;
+ // Null this before removing the component to avoid any infinite loops.
+ VisitingEntity = null;
+
+ DebugTools.AssertNotNull(oldVisitingEnt);
+ _entityManager.RemoveComponent<VisitingMindComponent>(oldVisitingEnt);
+ _entityManager.EventBus.RaiseLocalEvent(oldVisitingEnt, new MindUnvisitedMessage(), true);
+ }
+
+ public bool TryGetSession([NotNullWhen(true)] out IPlayerSession? session)
+ {
+ return (session = Session) != null;
+ }
}
}
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Server.Administration.Logs;
using Content.Server.GameTicking;
using Content.Server.Ghost;
using Content.Server.Ghost.Components;
using Content.Server.Mind.Components;
-using Content.Server.Objectives;
-using Content.Server.Players;
-using Content.Server.Roles;
-using Content.Shared.Database;
using Content.Shared.Examine;
+using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs.Components;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
using Robust.Shared.Map;
-using Robust.Shared.Network;
using Robust.Shared.Timing;
-using Robust.Shared.Utility;
namespace Content.Server.Mind;
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly GhostSystem _ghostSystem = default!;
- [Dependency] private readonly IAdminLogManager _adminLogger = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent<MindContainerComponent, ComponentShutdown>(OnShutdown);
- SubscribeLocalEvent<MindContainerComponent, ExaminedEvent>(OnExamined);
- SubscribeLocalEvent<MindContainerComponent, SuicideEvent>(OnSuicide);
- SubscribeLocalEvent<VisitingMindComponent, ComponentRemove>(OnVisitingMindRemoved);
- }
-
- private void OnVisitingMindRemoved(EntityUid uid, VisitingMindComponent component, ComponentRemove args)
- {
- UnVisit(component.Mind);
+ SubscribeLocalEvent<MindComponent, ComponentShutdown>(OnShutdown);
+ SubscribeLocalEvent<MindComponent, ExaminedEvent>(OnExamined);
+ SubscribeLocalEvent<MindComponent, SuicideEvent>(OnSuicide);
}
- public void SetGhostOnShutdown(EntityUid uid, bool value, MindContainerComponent? mind = null)
+ public void SetGhostOnShutdown(EntityUid uid, bool value, MindComponent? mind = null)
{
if (!Resolve(uid, ref mind))
return;
/// <summary>
/// Don't call this unless you know what the hell you're doing.
- /// Use <see cref="MindSystem.TransferTo(Mind,System.Nullable{Robust.Shared.GameObjects.EntityUid},bool)"/> instead.
+ /// Use <see cref="Mind.TransferTo(System.Nullable{Robust.Shared.GameObjects.EntityUid},bool)"/> instead.
/// If that doesn't cover it, make something to cover it.
/// </summary>
- private void InternalAssignMind(EntityUid uid, Mind value, MindContainerComponent? mind = null)
+ public void InternalAssignMind(EntityUid uid, Mind value, MindComponent? mind = null)
{
if (!Resolve(uid, ref mind))
return;
/// <summary>
/// Don't call this unless you know what the hell you're doing.
- /// Use <see cref="MindSystem.TransferTo(Mind,System.Nullable{Robust.Shared.GameObjects.EntityUid},bool)"/> instead.
+ /// Use <see cref="Mind.TransferTo(System.Nullable{Robust.Shared.GameObjects.EntityUid},bool)"/> instead.
/// If that doesn't cover it, make something to cover it.
/// </summary>
- private void InternalEjectMind(EntityUid uid, MindContainerComponent? mind = null)
+ public void InternalEjectMind(EntityUid uid, MindComponent? mind = null)
{
if (!Resolve(uid, ref mind))
return;
mind.Mind = null;
}
- private void OnShutdown(EntityUid uid, MindContainerComponent mindContainerComp, ComponentShutdown args)
+ private void OnShutdown(EntityUid uid, MindComponent mind, ComponentShutdown args)
{
// Let's not create ghosts if not in the middle of the round.
if (_gameTicker.RunLevel != GameRunLevel.InRound)
return;
- if (!TryGetMind(uid, out var mind, mindContainerComp))
- return;
-
- if (mind.VisitingEntity is {Valid: true} visiting)
- {
- if (TryComp(visiting, out GhostComponent? ghost))
- {
- _ghostSystem.SetCanReturnToBody(ghost, false);
- }
-
- TransferTo(mind, visiting);
- }
- else if (mindContainerComp.GhostOnShutdown)
+ if (mind.HasMind)
{
- // Changing an entities parents while deleting is VERY sus. This WILL throw exceptions.
- // TODO: just find the applicable spawn position directly without actually updating the transform's parent.
- Transform(uid).AttachToGridOrMap();
- var spawnPosition = Transform(uid).Coordinates;
-
- // Use a regular timer here because the entity has probably been deleted.
- Timer.Spawn(0, () =>
+ if (mind.Mind?.VisitingEntity is {Valid: true} visiting)
{
- // Make extra sure the round didn't end between spawning the timer and it being executed.
- if (_gameTicker.RunLevel != GameRunLevel.InRound)
- return;
-
- // Async this so that we don't throw if the grid we're on is being deleted.
- var gridId = spawnPosition.GetGridUid(EntityManager);
- if (!spawnPosition.IsValid(EntityManager) || gridId == EntityUid.Invalid || !_mapManager.GridExists(gridId))
- {
- spawnPosition = _gameTicker.GetObserverSpawnPoint();
- }
-
- // TODO refactor observer spawning.
- // please.
- if (!spawnPosition.IsValid(EntityManager))
+ if (TryComp(visiting, out GhostComponent? ghost))
{
- // This should be an error, if it didn't cause tests to start erroring when they delete a player.
- Logger.WarningS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, and no applicable spawn location is available.");
- TransferTo(mind, null);
- return;
+ _ghostSystem.SetCanReturnToBody(ghost, false);
}
- var ghost = Spawn("MobObserver", spawnPosition);
- var ghostComponent = Comp<GhostComponent>(ghost);
- _ghostSystem.SetCanReturnToBody(ghostComponent, false);
-
- // Log these to make sure they're not causing the GameTicker round restart bugs...
- Logger.DebugS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.CharacterName} was deleted, spawned \"{ToPrettyString(ghost)}\".");
-
- var val = mind.CharacterName ?? string.Empty;
- MetaData(ghost).EntityName = val;
- TransferTo(mind, ghost);
- });
- }
- }
-
- private void OnExamined(EntityUid uid, MindContainerComponent mindContainer, ExaminedEvent args)
- {
- if (!mindContainer.ShowExamineInfo || !args.IsInDetailsRange)
- return;
-
- var dead = _mobStateSystem.IsDead(uid);
- var hasSession = mindContainer.Mind?.Session;
-
- if (dead && hasSession == null)
- args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-dead-and-ssd", ("ent", uid))}[/color]");
- else if (dead)
- args.PushMarkup($"[color=red]{Loc.GetString("comp-mind-examined-dead", ("ent", uid))}[/color]");
- else if (!mindContainer.HasMind)
- args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-catatonic", ("ent", uid))}[/color]");
- else if (hasSession == null)
- args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]");
- }
-
- private void OnSuicide(EntityUid uid, MindContainerComponent component, SuicideEvent args)
- {
- if (args.Handled)
- return;
-
- if (component.HasMind && component.Mind.PreventSuicide)
- {
- args.BlockSuicideAttempt(true);
- }
- }
-
- public Mind? GetMind(EntityUid uid, MindContainerComponent? mind = null)
- {
- if (!Resolve(uid, ref mind))
- return null;
-
- if (mind.HasMind)
- return mind.Mind;
- return null;
- }
-
- public Mind CreateMind(NetUserId? userId, string? name = null)
- {
- var mind = new Mind(userId);
- mind.CharacterName = name;
- ChangeOwningPlayer(mind, userId);
- return mind;
- }
-
- /// <summary>
- /// True if the OwnedEntity of this mind is physically dead.
- /// This specific definition, as opposed to CharacterDeadIC, is used to determine if ghosting should allow return.
- /// </summary>
- public bool IsCharacterDeadPhysically(Mind mind)
- {
- // This is written explicitly so that the logic can be understood.
- // But it's also weird and potentially situational.
- // Specific considerations when updating this:
- // + Does being turned into a borg (if/when implemented) count as dead?
- // *If not, add specific conditions to users of this property where applicable.*
- // + Is being transformed into a donut 'dead'?
- // TODO: Consider changing the way ghost roles work.
- // Mind is an *IC* mind, therefore ghost takeover is IC revival right now.
- // + Is it necessary to have a reference to a specific 'mind iteration' to cycle when certain events happen?
- // (If being a borg or AI counts as dead, then this is highly likely, as it's still the same Mind for practical purposes.)
-
- if (mind.OwnedEntity == null)
- return true;
-
- // This can be null if they're deleted (spike / brain nom)
- var targetMobState = EntityManager.GetComponentOrNull<MobStateComponent>(mind.OwnedEntity);
- // This can be null if it's a brain (this happens very often)
- // Brains are the result of gibbing so should definitely count as dead
- if (targetMobState == null)
- return true;
- // They might actually be alive.
- return _mobStateSystem.IsDead(mind.OwnedEntity.Value, targetMobState);
- }
-
- public void Visit(Mind mind, EntityUid entity)
- {
- mind.Session?.AttachToEntity(entity);
- mind.VisitingEntity = entity;
-
- var comp = AddComp<VisitingMindComponent>(entity);
- comp.Mind = mind;
-
- Logger.Info($"Session {mind.Session?.Name} visiting entity {entity}.");
- }
-
- /// <summary>
- /// Returns the mind to its original entity.
- /// </summary>
- public void UnVisit(Mind? mind)
- {
- if (mind == null)
- return;
-
- var currentEntity = mind.Session?.AttachedEntity;
- mind.Session?.AttachToEntity(mind.OwnedEntity);
- RemoveVisitingEntity(mind);
-
- var owned = mind.OwnedEntity;
- if (mind.Session != null && owned != null && owned != currentEntity)
- {
- _adminLogger.Add(LogType.Mind, LogImpact.Low,
- $"{mind.Session.Name} returned to {ToPrettyString(owned.Value)}");
- }
- }
-
- /// <summary>
- /// Cleans up the VisitingEntity.
- /// </summary>
- /// <param name="mind"></param>
- private void RemoveVisitingEntity(Mind mind)
- {
- if (mind.VisitingEntity == null)
- return;
-
- var oldVisitingEnt = mind.VisitingEntity.Value;
- // Null this before removing the component to avoid any infinite loops.
- mind.VisitingEntity = null;
-
- DebugTools.AssertNotNull(oldVisitingEnt);
- RemComp<VisitingMindComponent>(oldVisitingEnt);
- RaiseLocalEvent(oldVisitingEnt, new MindUnvisitedMessage(), true);
- }
-
- /// <summary>
- /// Transfer this mind's control over to a new entity.
- /// </summary>
- /// <param name="mind">The mind to transfer</param>
- /// <param name="entity">
- /// The entity to control.
- /// Can be null, in which case it will simply detach the mind from any entity.
- /// </param>
- /// <param name="ghostCheckOverride">
- /// If true, skips ghost check for Visiting Entity
- /// </param>
- /// <exception cref="ArgumentException">
- /// Thrown if <paramref name="entity"/> is already owned by another mind.
- /// </exception>
- public void TransferTo(Mind mind, EntityUid? entity, bool ghostCheckOverride = false)
- {
- // Looks like caller just wants us to go back to normal.
- if (entity == mind.OwnedEntity)
- {
- UnVisit(mind);
- return;
- }
-
- MindContainerComponent? component = null;
- var alreadyAttached = false;
-
- if (entity != null)
- {
- if (!TryComp(entity.Value, out component))
- {
- component = AddComp<MindContainerComponent>(entity.Value);
+ mind.Mind!.TransferTo(visiting);
}
- else if (component.HasMind)
+ else if (mind.GhostOnShutdown)
{
- _gameTicker.OnGhostAttempt(component.Mind, false);
- }
+ // Changing an entities parents while deleting is VERY sus. This WILL throw exceptions.
+ // TODO: just find the applicable spawn position dirctly without actually updating the transform's parent.
+ Transform(uid).AttachToGridOrMap();
+ var spawnPosition = Transform(uid).Coordinates;
- if (TryComp<ActorComponent>(entity.Value, out var actor))
- {
- // Happens when transferring to your currently visited entity.
- if (actor.PlayerSession != mind.Session)
+ // Use a regular timer here because the entity has probably been deleted.
+ Timer.Spawn(0, () =>
{
- throw new ArgumentException("Visit target already has a session.", nameof(entity));
- }
-
- alreadyAttached = true;
+ // Make extra sure the round didn't end between spawning the timer and it being executed.
+ if (_gameTicker.RunLevel != GameRunLevel.InRound)
+ return;
+
+ // Async this so that we don't throw if the grid we're on is being deleted.
+ var gridId = spawnPosition.GetGridUid(EntityManager);
+ if (!spawnPosition.IsValid(EntityManager) || gridId == EntityUid.Invalid || !_mapManager.GridExists(gridId))
+ {
+ spawnPosition = _gameTicker.GetObserverSpawnPoint();
+ }
+
+ // TODO refactor observer spawning.
+ // please.
+ if (!spawnPosition.IsValid(EntityManager))
+ {
+ // This should be an error, if it didn't cause tests to start erroring when they delete a player.
+ Logger.WarningS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.Mind?.CharacterName} was deleted, and no applicable spawn location is available.");
+ mind.Mind?.TransferTo(null);
+ return;
+ }
+
+ var ghost = Spawn("MobObserver", spawnPosition);
+ var ghostComponent = Comp<GhostComponent>(ghost);
+ _ghostSystem.SetCanReturnToBody(ghostComponent, false);
+
+ // Log these to make sure they're not causing the GameTicker round restart bugs...
+ Logger.DebugS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.Mind?.CharacterName} was deleted, spawned \"{ToPrettyString(ghost)}\".");
+
+ if (mind.Mind == null)
+ return;
+
+ var val = mind.Mind.CharacterName ?? string.Empty;
+ MetaData(ghost).EntityName = val;
+ mind.Mind.TransferTo(ghost);
+ });
}
}
-
- var oldComp = mind.OwnedComponent;
- var oldEntity = mind.OwnedEntity;
- if(oldComp != null && oldEntity != null)
- InternalEjectMind(oldEntity.Value, oldComp);
-
- SetOwnedEntity(mind, entity, component);
- if (mind.OwnedComponent != null)
- InternalAssignMind(mind.OwnedEntity!.Value, mind, mind.OwnedComponent);
-
- // Don't do the full deletion cleanup if we're transferring to our VisitingEntity
- if (alreadyAttached)
- {
- // Set VisitingEntity null first so the removal of VisitingMind doesn't get through Unvisit() and delete what we're visiting.
- // Yes this control flow sucks.
- mind.VisitingEntity = null;
- RemComp<VisitingMindComponent>(entity!.Value);
- }
- else if (mind.VisitingEntity != null
- && (ghostCheckOverride // to force mind transfer, for example from ControlMobVerb
- || !TryComp(mind.VisitingEntity!, out GhostComponent? ghostComponent) // visiting entity is not a Ghost
- || !ghostComponent.CanReturnToBody)) // it is a ghost, but cannot return to body anyway, so it's okay
- {
- RemoveVisitingEntity(mind);
- }
-
- // Player is CURRENTLY connected.
- if (mind.Session != null && !alreadyAttached && mind.VisitingEntity == null)
- {
- mind.Session.AttachToEntity(entity);
- Logger.Info($"Session {mind.Session.Name} transferred to entity {entity}.");
- }
}
- public void ChangeOwningPlayer(Mind mind, NetUserId? newOwner)
+ private void OnExamined(EntityUid uid, MindComponent mind, ExaminedEvent args)
{
- // Make sure to remove control from our old owner if they're logged in.
- var oldSession = mind.Session;
- oldSession?.AttachToEntity(null);
-
- if (mind.UserId.HasValue)
- {
- if (_playerManager.TryGetPlayerData(mind.UserId.Value, out var oldUncast))
- {
- var data = oldUncast.ContentData();
- DebugTools.AssertNotNull(data);
- data!.UpdateMindFromMindChangeOwningPlayer(null);
- }
- else
- {
- Logger.Warning($"Mind UserId {newOwner} is does not exist in PlayerManager");
- }
- }
-
- SetUserId(mind, newOwner);
- if (!newOwner.HasValue)
+ if (!mind.ShowExamineInfo || !args.IsInDetailsRange)
{
return;
}
-
- if (!_playerManager.TryGetPlayerData(newOwner.Value, out var uncast))
- {
- // This restriction is because I'm too lazy to initialize the player data
- // for a client that hasn't logged in yet.
- // Go ahead and remove it if you need.
- throw new ArgumentException("New owner must have previously logged into the server.", nameof(newOwner));
- }
-
- // PlayerData? newOwnerData = null;
- var newOwnerData = uncast.ContentData();
-
- // Yank new owner out of their old mind too.
- // Can I mention how much I love the word yank?
- DebugTools.AssertNotNull(newOwnerData);
- if (newOwnerData!.Mind != null)
- ChangeOwningPlayer(newOwnerData.Mind, null);
- newOwnerData.UpdateMindFromMindChangeOwningPlayer(mind);
- }
-
- /// <summary>
- /// Adds an objective to this mind.
- /// </summary>
- public bool TryAddObjective(Mind mind, ObjectivePrototype objectivePrototype)
- {
- if (!objectivePrototype.CanBeAssigned(mind))
- return false;
- var objective = objectivePrototype.GetObjective(mind);
- if (mind.Objectives.Contains(objective))
- return false;
-
- foreach (var condition in objective.Conditions)
- {
- _adminLogger.Add(LogType.Mind, LogImpact.Low, $"'{condition.Title}' added to mind of {MindOwnerLoggingString(mind)}");
- }
-
-
- mind.Objectives.Add(objective);
- return true;
- }
-
- /// <summary>
- /// Removes an objective to this mind.
- /// </summary>
- /// <returns>Returns true if the removal succeeded.</returns>
- public bool TryRemoveObjective(Mind mind, int index)
- {
- if (mind.Objectives.Count >= index) return false;
- var objective = mind.Objectives[index];
+ var dead = TryComp<MobStateComponent?>(uid, out var state) && _mobStateSystem.IsDead(uid, state);
- foreach (var condition in objective.Conditions)
+ if (dead)
{
- _adminLogger.Add(LogType.Mind, LogImpact.Low, $"'{condition.Title}' removed from the mind of {MindOwnerLoggingString(mind)}");
+ if (mind.Mind?.Session == null) {
+ // Player has no session attached and dead
+ args.PushMarkup($"[color=yellow]{Loc.GetString("mind-component-no-mind-and-dead-text", ("ent", uid))}[/color]");
+ } else {
+ // Player is dead with session
+ args.PushMarkup($"[color=red]{Loc.GetString("comp-mind-examined-dead", ("ent", uid))}[/color]");
+ }
}
-
- mind.Objectives.Remove(objective);
- return true;
- }
-
- /// <summary>
- /// Gives this mind a new role.
- /// </summary>
- /// <param name="mind">The mind to add the role to.</param>
- /// <param name="role">The type of the role to give.</param>
- /// <returns>The instance of the role.</returns>
- /// <exception cref="ArgumentException">
- /// Thrown if we already have a role with this type.
- /// </exception>
- public void AddRole(Mind mind, Role role)
- {
- if (mind.Roles.Contains(role))
+ else if (!mind.HasMind)
{
- throw new ArgumentException($"We already have this role: {role}");
+ args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-catatonic", ("ent", uid))}[/color]");
}
-
- mind.Roles.Add(role);
- role.Greet();
-
- var message = new RoleAddedEvent(mind, role);
- if (mind.OwnedEntity != null)
+ else if (mind.Mind?.Session == null)
{
- RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
+ args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]");
}
-
- _adminLogger.Add(LogType.Mind, LogImpact.Low,
- $"'{role.Name}' added to mind of {MindOwnerLoggingString(mind)}");
}
- /// <summary>
- /// Removes a role from this mind.
- /// </summary>
- /// <param name="mind">The mind to remove the role from.</param>
- /// <param name="role">The type of the role to remove.</param>
- /// <exception cref="ArgumentException">
- /// Thrown if we do not have this role.
- /// </exception>
- public void RemoveRole(Mind mind, Role role)
+ private void OnSuicide(EntityUid uid, MindComponent component, SuicideEvent args)
{
- if (!mind.Roles.Contains(role))
- {
- throw new ArgumentException($"We do not have this role: {role}");
- }
-
- mind.Roles.Remove(role);
-
- var message = new RoleRemovedEvent(mind, role);
+ if (args.Handled)
+ return;
- if (mind.OwnedEntity != null)
+ if (component.HasMind && component.Mind!.PreventSuicide)
{
- RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
+ args.BlockSuicideAttempt(true);
}
- _adminLogger.Add(LogType.Mind, LogImpact.Low,
- $"'{role.Name}' removed from mind of {MindOwnerLoggingString(mind)}");
- }
-
- public bool HasRole<T>(Mind mind) where T : Role
- {
- var t = typeof(T);
-
- return mind.Roles.Any(role => role.GetType() == t);
- }
-
- public bool TryGetSession(Mind mind, [NotNullWhen(true)] out IPlayerSession? session)
- {
- return (session = mind.Session) != null;
- }
-
- /// <summary>
- /// Gets a mind from uid and/or MindContainerComponent. Used for null checks.
- /// </summary>
- /// <param name="uid">Entity UID that owns the mind.</param>
- /// <param name="mind">The returned mind.</param>
- /// <param name="mindContainerComponent">Mind component on <paramref name="uid"/> to get the mind from.</param>
- /// <returns>True if mind found. False if not.</returns>
- public bool TryGetMind(EntityUid uid, [NotNullWhen(true)] out Mind? mind, MindContainerComponent? mindContainerComponent = null)
- {
- mind = null;
- if (!Resolve(uid, ref mindContainerComponent))
- return false;
-
- if (!mindContainerComponent.HasMind)
- return false;
-
- mind = mindContainerComponent.Mind;
- return true;
- }
-
- /// <summary>
- /// Sets the Mind's OwnedComponent and OwnedEntity
- /// </summary>
- /// <param name="mind">Mind to set OwnedComponent and OwnedEntity on</param>
- /// <param name="uid">Entity owned by <paramref name="mind"/></param>
- /// <param name="mindContainerComponent">MindContainerComponent owned by <paramref name="mind"/></param>
- private void SetOwnedEntity(Mind mind, EntityUid? uid, MindContainerComponent? mindContainerComponent)
- {
- if (uid != null)
- Resolve(uid.Value, ref mindContainerComponent);
-
- mind.OwnedEntity = uid;
- mind.OwnedComponent = mindContainerComponent;
- }
-
- /// <summary>
- /// Sets the Mind's UserId and Session
- /// </summary>
- /// <param name="mind"></param>
- /// <param name="userId"></param>
- private void SetUserId(Mind mind, NetUserId? userId)
- {
- mind.UserId = userId;
-
- if (!userId.HasValue)
- return;
-
- _playerManager.TryGetSessionById(userId.Value, out var ret);
- mind.Session = ret;
- }
-
- /// <summary>
- /// True if this Mind is 'sufficiently dead' IC (Objectives, EndText).
- /// Note that this is *IC logic*, it's not necessarily tied to any specific truth.
- /// "If administrators decide that zombies are dead, this returns true for zombies."
- /// (Maybe you were looking for the action blocker system?)
- /// </summary>
- public bool IsCharacterDeadIc(Mind mind)
- {
- return IsCharacterDeadPhysically(mind);
- }
-
- /// <summary>
- /// A string to represent the mind for logging
- /// </summary>
- private string MindOwnerLoggingString(Mind mind)
- {
- if (mind.OwnedEntity != null)
- return ToPrettyString(mind.OwnedEntity.Value);
- if (mind.UserId != null)
- return mind.UserId.Value.ToString();
- return "(originally " + mind.OriginalOwnerUserId + ")";
}
}
base.Initialize();
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
- SubscribeLocalEvent<MindContainerComponent, MindAddedMessage>(OnMindAdded);
+ SubscribeLocalEvent<MindComponent, MindAddedMessage>(OnMindAdded);
}
void Reset(RoundRestartCleanupEvent ev)
AllMinds.Clear();
}
- void OnMindAdded(EntityUid uid, MindContainerComponent mc, MindAddedMessage args)
+ void OnMindAdded(EntityUid uid, MindComponent mc, MindAddedMessage args)
{
var mind = mc.Mind;
if (mind != null)
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly TagSystem _tag = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
/// <inheritdoc/>
public override void Initialize()
private void OnGib(EntityUid uid, TransferMindOnGibComponent component, BeingGibbedEvent args)
{
- if (!TryComp<MindContainerComponent>(uid, out var mindcomp) || mindcomp.Mind == null)
+ if (!TryComp<MindComponent>(uid, out var mindcomp) || mindcomp.Mind == null)
return;
var validParts = args.GibbedParts.Where(p => _tag.HasTag(p, component.TargetTag)).ToHashSet();
return;
var ent = _random.Pick(validParts);
- _mindSystem.TransferTo(mindcomp.Mind, ent);
+ mindcomp.Mind.TransferTo(ent);
}
}
using Content.Server.Administration;
-using Content.Server.Mind;
using Content.Server.Players;
using Content.Shared.Administration;
using Robust.Server.Player;
[AdminCommand(AdminFlags.Admin)]
public sealed class AddObjectiveCommand : IConsoleCommand
{
- [Dependency] private readonly IEntityManager _entityManager = default!;
-
public string Command => "addobjective";
public string Description => "Adds an objective to the player's mind.";
public string Help => "addobjective <username> <objectiveID>";
shell.WriteLine($"Can't find matching ObjectivePrototype {objectivePrototype}");
return;
}
-
- var mindSystem = _entityManager.System<MindSystem>();
- if (!mindSystem.TryAddObjective(mind, objectivePrototype))
+ if (!mind.TryAddObjective(objectivePrototype))
{
shell.WriteLine("Objective requirements dont allow that objective to be added.");
}
using Content.Server.Administration;
-using Content.Server.Mind;
using Content.Server.Players;
using Content.Shared.Administration;
using Robust.Server.Player;
[AdminCommand(AdminFlags.Admin)]
public sealed class RemoveObjectiveCommand : IConsoleCommand
{
- [Dependency] private readonly IEntityManager _entityManager = default!;
-
public string Command => "rmobjective";
public string Description => "Removes an objective from the player's mind.";
public string Help => "rmobjective <username> <index>";
if (int.TryParse(args[1], out var i))
{
- var mindSystem = _entityManager.System<MindSystem>();
- shell.WriteLine(mindSystem.TryRemoveObjective(mind, i)
+ shell.WriteLine(mind.TryRemoveObjective(i)
? "Objective successfully removed!"
: "Objective removing failed. Maybe the index is out of bounds? Check lsobjectives!");
}
-using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using JetBrains.Annotations;
using Robust.Shared.Utility;
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Mobs/Ghosts/ghost_human.rsi"), "icon");
- public float Progress
- {
- get
- {
- var entityManager = IoCManager.Resolve<EntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- return _mind == null || mindSystem.IsCharacterDeadIc(_mind) ? 1f : 0f;
- }
- }
+ public float Progress => (_mind?.CharacterDeadIC ?? true) ? 1f : 0f;
public float Difficulty => 0.5f;
-using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Server.Station.Components;
using Content.Shared.Cuffs.Components;
{
get {
var entMan = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entMan.System<MindSystem>();
if (_mind?.OwnedEntity == null
|| !entMan.TryGetComponent<TransformComponent>(_mind.OwnedEntity, out var xform))
return 0f;
var shuttleContainsAgent = false;
- var agentIsAlive = !mindSystem.IsCharacterDeadIc(_mind);
+ var agentIsAlive = !_mind.CharacterDeadIC;
var agentIsEscaping = true;
if (entMan.TryGetComponent<CuffableComponent>(_mind.OwnedEntity, out var cuffed)
-using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Shared.Mobs.Systems;
using Robust.Shared.Utility;
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Weapons/Guns/Pistols/viper.rsi"), "icon");
- public float Progress
- {
- get
- {
- var entityManager = IoCManager.Resolve<EntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- return Target == null || mindSystem.IsCharacterDeadIc(Target) ? 1f : 0f;
- }
- }
+ public float Progress => (Target?.CharacterDeadIC ?? true) ? 1f : 0f;
public float Difficulty => 2f;
{
public override IObjectiveCondition GetAssigned(Mind.Mind mind)
{
- var allHumans = EntityManager.EntityQuery<MindContainerComponent>(true).Where(mc =>
+ var allHumans = EntityManager.EntityQuery<MindComponent>(true).Where(mc =>
{
var entity = mc.Mind?.OwnedEntity;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using Content.Server.GameTicking.Rules;
-using Content.Server.Mind;
namespace Content.Server.Objectives.Conditions
{
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/bureaucracy.rsi"), "folder-white");
- public float Progress
- {
- get
- {
- var entityManager = IoCManager.Resolve<EntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- return _target == null || mindSystem.IsCharacterDeadIc(_target) ? 1f : 0f;
- }
- }
+ public float Progress => (!_target?.CharacterDeadIC ?? true) ? 1f : 0f;
public float Difficulty => 1.75f;
-using Content.Server.Mind;
-using Content.Server.Objectives.Interfaces;
+using Content.Server.Objectives.Interfaces;
using Content.Server.Traitor;
using JetBrains.Annotations;
{
public bool CanBeAssigned(Mind.Mind mind)
{
- var entityManager = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- return mindSystem.HasRole<TraitorRole>(mind);
+ return mind.HasRole<TraitorRole>();
}
}
}
{
if (args.IsInDetailsRange)
{
- if (EntityManager.TryGetComponent<MindContainerComponent>(uid, out var mind) && mind.HasMind)
+ if (EntityManager.TryGetComponent<MindComponent>(uid, out var mind) && mind.HasMind)
{
args.PushMarkup(Loc.GetString("pai-system-pai-installed"));
}
args.Handled = true;
// Check for pAI activation
- if (EntityManager.TryGetComponent<MindContainerComponent>(uid, out var mind) && mind.HasMind)
+ if (EntityManager.TryGetComponent<MindComponent>(uid, out var mind) && mind.HasMind)
{
_popupSystem.PopupEntity(Loc.GetString("pai-system-pai-installed"), uid, args.User, PopupType.Large);
return;
if (!args.CanAccess || !args.CanInteract)
return;
- if (EntityManager.TryGetComponent<MindContainerComponent>(uid, out var mind) && mind.HasMind)
+ if (EntityManager.TryGetComponent<MindComponent>(uid, out var mind) && mind.HasMind)
{
ActivationVerb verb = new();
verb.Text = Loc.GetString("pai-system-wipe-device-verb-text");
// Wiping device :(
// The shutdown of the Mind should cause automatic reset of the pAI during OnMindRemoved
// EDIT: But it doesn't!!!! Wtf? Do stuff manually
- if (EntityManager.HasComponent<MindContainerComponent>(uid))
+ if (EntityManager.HasComponent<MindComponent>(uid))
{
- EntityManager.RemoveComponent<MindContainerComponent>(uid);
+ EntityManager.RemoveComponent<MindComponent>(uid);
_popupSystem.PopupEntity(Loc.GetString("pai-system-wiped-device"), uid, args.User, PopupType.Large);
PAITurningOff(uid);
}
using Content.Server.Light.Components;
using Content.Server.Light.EntitySystems;
using Content.Server.Light.Events;
-using Content.Server.Mind;
using Content.Server.PDA.Ringer;
using Content.Server.Store.Components;
using Content.Server.Store.Systems;
[Dependency] private readonly StationSystem _stationSystem = default!;
[Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
[Dependency] private readonly StoreSystem _storeSystem = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public override void Initialize()
{
if (session.AttachedEntity is not { Valid: true } user)
continue;
- if (storeComponent.AccountOwner == user
- || (TryComp<MindContainerComponent>(session.AttachedEntity, out var mindComp)
- && mindComp.Mind != null
- && _mindSystem.HasRole<TraitorRole>(mindComp.Mind)))
+ if (storeComponent.AccountOwner == user || (TryComp<MindComponent>(session.AttachedEntity, out var mindcomp) && mindcomp.Mind != null &&
+ mindcomp.Mind.HasRole<TraitorRole>()))
_cartridgeLoaderSystem?.UpdateUiState(pda.Owner, uplinkState, session);
}
}
if (!TryComp<StoreComponent>(pda.Owner, out var storeComp))
return;
- if (storeComp.AccountOwner != args.User
- && !(TryComp<MindContainerComponent>(args.User, out var mindComp)
- && mindComp.Mind != null
- && _mindSystem.HasRole<TraitorRole>(mindComp.Mind))) return;
+ if (storeComp.AccountOwner != args.User &&
+ !(TryComp<MindComponent>(args.User, out var mindcomp) && mindcomp.Mind != null && mindcomp.Mind.HasRole<TraitorRole>()))
+ return;
if (!_uiSystem.TryGetUi(pda.Owner, PDAUiKey.Key, out var ui))
return;
}
// Logging
- _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindContainerComponent? mindContainerComponent);
- if(mindContainerComponent != null)
- _adminLogger.Add(LogType.Action, LogImpact.Low, $"{_entMan.ToPrettyString(mindContainerComponent.Owner):player} has set {_entMan.ToPrettyString(Owner)} to on");
+ _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindComponent? mindComponent);
+ if(mindComponent != null)
+ _adminLogger.Add(LogType.Action, LogImpact.Low, $"{_entMan.ToPrettyString(mindComponent.Owner):player} has set {_entMan.ToPrettyString(Owner)} to on");
_isEnabled = true;
UpdatePowerDraw();
public void SwitchOff(IPlayerSession? playerSession = null, bool rescan = false)
{
// Logging
- _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindContainerComponent? mindContainerComponent);
- if(mindContainerComponent != null)
- _adminLogger.Add(LogType.Action, LogImpact.Low, $"{_entMan.ToPrettyString(mindContainerComponent.Owner):player} has set {_entMan.ToPrettyString(Owner)} to off{(rescan ? " via rescan" : "")}");
+ _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindComponent? mindComponent);
+ if(mindComponent != null)
+ _adminLogger.Add(LogType.Action, LogImpact.Low, $"{_entMan.ToPrettyString(mindComponent.Owner):player} has set {_entMan.ToPrettyString(Owner)} to off{(rescan ? " via rescan" : "")}");
_isEnabled = false;
PowerOff();
UpdatePartVisualStates();
// Logging
- _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindContainerComponent? mindContainerComponent);
+ _entMan.TryGetComponent(playerSession?.AttachedEntity, out MindComponent? mindComponent);
LogImpact impact;
switch (state)
{
impact = LogImpact.Extreme;
break;
}
- if(mindContainerComponent != null)
- _adminLogger.Add(LogType.Action, impact, $"{_entMan.ToPrettyString(mindContainerComponent.Owner):player} has set the strength of {_entMan.ToPrettyString(Owner)} to {state}");
+ if(mindComponent != null)
+ _adminLogger.Add(LogType.Action, impact, $"{_entMan.ToPrettyString(mindComponent.Owner):player} has set the strength of {_entMan.ToPrettyString(Owner)} to {state}");
if (_isEnabled)
{
-using Content.Server.Mind;
using Robust.Server.Player;
using Robust.Shared.Network;
public void WipeMind()
{
- var entityManager = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
-
+ Mind?.TransferTo(null);
// This will ensure Mind == null
- if (Mind == null)
- return;
-
- mindSystem.TransferTo(Mind, null);
- mindSystem.ChangeOwningPlayer(Mind, null);
+ Mind?.ChangeOwningPlayer(null);
}
/// <summary>
using Content.Server.Buckle.Systems;
using Content.Server.Humanoid;
using Content.Server.Inventory;
-using Content.Server.Mind;
using Content.Server.Mind.Commands;
using Content.Server.Mind.Components;
using Content.Server.Polymorph.Components;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly TransformSystem _transform = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
private readonly ISawmill _saw = default!;
_humanoid.CloneAppearance(uid, child);
}
- if (_mindSystem.TryGetMind(uid, out var mind))
- _mindSystem.TransferTo(mind, child);
+ if (TryComp<MindComponent>(uid, out var mind) && mind.Mind != null)
+ mind.Mind.TransferTo(child);
//Ensures a map to banish the entity to
EnsurePausesdMap();
}
}
- if (_mindSystem.TryGetMind(uid, out var mind))
- _mindSystem.TransferTo(mind, parent);
+ if (TryComp<MindComponent>(uid, out var mind) && mind.Mind != null)
+ {
+ mind.Mind.TransferTo(parent);
+ }
_popup.PopupEntity(Loc.GetString("polymorph-revert-popup-generic",
("parent", Identity.Entity(uid, EntityManager)),
switch (mob.CurrentState)
{
case MobState.Alive:
- if (TryComp<MindContainerComponent>(uid, out var mind) && mind.Mind != null)
+ if (TryComp<MindComponent>(uid, out var mind) && mind.Mind != null)
component.EssenceAmount = _random.NextFloat(75f, 100f);
else
component.EssenceAmount = _random.NextFloat(45f, 70f);
using Robust.Shared.Console;
using Robust.Shared.Prototypes;
using System.Linq;
-using Content.Server.Mind;
namespace Content.Server.Roles
{
[AdminCommand(AdminFlags.Admin)]
public sealed class AddRoleCommand : IConsoleCommand
{
- [Dependency] private readonly EntityManager _entityManager = default!;
-
public string Command => "addrole";
public string Description => "Adds a role to a player's mind.";
}
var role = new Job(mind, jobPrototype);
- var mindSystem = _entityManager.System<MindSystem>();
- mindSystem.AddRole(mind, role);
+ mind.AddRole(role);
}
}
}
using Content.Server.Chat.Systems;
using Content.Shared.Roles;
using System.Globalization;
-using Content.Server.Mind;
namespace Content.Server.Roles
{
public override void Greet()
{
base.Greet();
-
- var entityManager = IoCManager.Resolve<EntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- if (mindSystem.TryGetSession(Mind, out var session))
+ if (Mind.TryGetSession(out var session))
{
var chatMgr = IoCManager.Resolve<IChatManager>();
chatMgr.DispatchServerMessage(session, Loc.GetString("job-greet-introduce-job-name",
using Content.Server.Administration;
-using Content.Server.Mind;
using Content.Server.Players;
using Content.Shared.Administration;
using Content.Shared.Roles;
public sealed class RemoveRoleCommand : IConsoleCommand
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
- [Dependency] private readonly IEntityManager _entityManager = default!;
public string Command => "rmrole";
}
var role = new Job(mind, _prototypeManager.Index<JobPrototype>(args[1]));
- var mindSystem = _entityManager.System<MindSystem>();
- mindSystem.RemoveRole(mind, role);
+ mind.RemoveRole(role);
}
}
}
if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
foreach (var entity in target.Value.storageComponent.Contents.ContainedEntities.ToArray())
{
- if (EntityManager.HasComponent<MindContainerComponent>(entity))
+ if (EntityManager.HasComponent<MindComponent>(entity))
{
if (!component.BehaviorProperties.TransportSentient)
continue;
if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
foreach (var entity in entityStorageComponent.Contents.ContainedEntities.ToArray())
{
- if (EntityManager.HasComponent<MindContainerComponent>(entity))
+ if (EntityManager.HasComponent<MindComponent>(entity))
{
if (!component.BehaviorProperties.TransportSentient)
continue;
{
var ent = args.EntityManager;
- if (!ent.TryGetComponent<MindContainerComponent>(args.Buyer, out var mind) || mind.Mind == null)
+ if (!ent.TryGetComponent<MindComponent>(args.Buyer, out var mind) || mind.Mind == null)
return true;
if (Blacklist != null)
{
var ent = args.EntityManager;
- if (!ent.TryGetComponent<MindContainerComponent>(args.Buyer, out var mind) || mind.Mind == null)
+ if (!ent.TryGetComponent<MindComponent>(args.Buyer, out var mind) || mind.Mind == null)
return true; //this is for things like surplus crate
if (Blacklist != null)
using Content.Server.Chat.Managers;
-using Content.Server.Mind;
using Content.Shared.Roles;
namespace Content.Server.Suspicion.Roles
base.Greet();
var chat = IoCManager.Resolve<IChatManager>();
- var entityManager = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
- if (mindSystem.TryGetSession(Mind, out var session))
+ if (Mind.TryGetSession(out var session))
{
chat.DispatchServerMessage(session, $"You're an {Name}!");
chat.DispatchServerMessage(session, $"Objective: {Objective}");
using System.Linq;
using Content.Server.Chat.Managers;
-using Content.Server.Mind;
using Content.Shared.Roles;
namespace Content.Server.Suspicion.Roles
public void GreetSuspicion(List<SuspicionTraitorRole> traitors, IChatManager chatMgr)
{
- var entityManager = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
-
- if (mindSystem.TryGetSession(Mind, out var session))
+ if (Mind.TryGetSession(out var session))
{
chatMgr.DispatchServerMessage(session, Loc.GetString("suspicion-role-greeting", ("roleName", Name)));
chatMgr.DispatchServerMessage(session, Loc.GetString("suspicion-objective", ("objectiveText", Objective)));
public void SyncRoles()
{
- if (!_entMan.TryGetComponent(Owner, out MindContainerComponent? mind) ||
+ if (!_entMan.TryGetComponent(Owner, out MindComponent? mind) ||
!mind.HasMind)
{
return;
}
- Role = mind.Mind.AllRoles.First(role => role is SuspicionRole);
+ Role = mind.Mind!.AllRoles.First(role => role is SuspicionRole);
}
public void AddAlly(SuspicionRoleComponent ally)
protected override void LogTeleport(EntityUid portal, EntityUid subject, EntityCoordinates source,
EntityCoordinates target)
{
- if (HasComp<MindContainerComponent>(subject))
+ if (HasComp<MindComponent>(subject))
_adminLogger.Add(LogType.Teleport, LogImpact.Low, $"{ToPrettyString(subject):player} teleported via {ToPrettyString(portal)} from {source} to {target}");
}
}
using Content.Server.Chat.Managers;
-using Content.Server.Mind;
using Content.Server.Roles;
using Content.Shared.Roles;
public void GreetTraitor(string[] codewords)
{
- var entityManager = IoCManager.Resolve<IEntityManager>();
- var mindSystem = entityManager.System<MindSystem>();
-
- if (mindSystem.TryGetSession(Mind, out var session))
+ if (Mind.TryGetSession(out var session))
{
var chatMgr = IoCManager.Resolve<IChatManager>();
chatMgr.DispatchServerMessage(session, Loc.GetString("traitor-role-greeting"));
private void OnInteractUsing(EntityUid uid, TraitorDeathMatchRedemptionComponent component, InteractUsingEvent args)
{
- if (!EntityManager.TryGetComponent<MindContainerComponent>(args.User, out var userMindComponent))
+ if (!EntityManager.TryGetComponent<MindComponent>(args.User, out var userMindComponent))
{
_popup.PopupEntity(Loc.GetString(
"traitor-death-match-redemption-component-interact-using-main-message",
using Content.Server.Atmos.Miasma;
using Content.Server.Humanoid;
using Content.Server.IdentityManagement;
-using Content.Server.Mind;
using Content.Shared.Humanoid;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
[Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!;
[Dependency] private readonly IChatManager _chatMan = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
- [Dependency] private readonly MindSystem _mindSystem = default!;
public override void Initialize()
{
_identity.QueueIdentityUpdate(target);
//He's gotta have a mind
- var mindComp = EnsureComp<MindContainerComponent>(target);
- if (_mindSystem.TryGetMind(target, out var mind, mindComp) && _mindSystem.TryGetSession(mind, out var session))
+ var mindcomp = EnsureComp<MindComponent>(target);
+ if (mindcomp.Mind != null && mindcomp.Mind.TryGetSession(out var session))
{
//Zombie role for player manifest
- _mindSystem.AddRole(mind, new TraitorRole(mind, _proto.Index<AntagPrototype>(zombiecomp.ZombieRoleId)));
+ mindcomp.Mind.AddRole(new TraitorRole(mindcomp.Mind, _proto.Index<AntagPrototype>(zombiecomp.ZombieRoleId)));
//Greeting message for new bebe zombers
_chatMan.DispatchServerMessage(session, Loc.GetString("zombie-infection-greeting"));
}
- if (!HasComp<GhostRoleMobSpawnerComponent>(target) && !mindComp.HasMind) //this specific component gives build test trouble so pop off, ig
+ if (!HasComp<GhostRoleMobSpawnerComponent>(target) && !mindcomp.HasMind) //this specific component gives build test trouble so pop off, ig
{
//yet more hardcoding. Visit zombie.ftl for more information.
EntityManager.EnsureComponent<GhostTakeoverAvailableComponent>(target, out var ghostcomp);
-# MindContainerComponent localization
+# MindComponent localization
comp-mind-ghosting-prevented = You are not able to ghost right now.
## Messages displayed when a body is examined and in a certain state
-
comp-mind-examined-catatonic = { CAPITALIZE(SUBJECT($ent)) } { CONJUGATE-BE($ent) } totally catatonic. The stresses of life in deep-space must have been too much for { OBJECT($ent) }. Any recovery is unlikely.
comp-mind-examined-dead = { CAPITALIZE(POSS-ADJ($ent)) } soul has departed.
comp-mind-examined-ssd = { CAPITALIZE(SUBJECT($ent)) } { CONJUGATE-HAVE($ent) } a blank, absent-minded stare and appears completely unresponsive to anything. { CAPITALIZE(SUBJECT($ent)) } may snap out of it soon.
-comp-mind-examined-dead-and-ssd = { CAPITALIZE(POSS-ADJ($ent)) } soul has departed and moved on. Any recovery is unlikely.
+
+
+mind-component-no-mind-and-alive-text = { CAPITALIZE(POSS-ADJ($ent)) } is totally catatonic. The stresses of life in deep-space must have been too much for them. Any recovery is unlikely.
+mind-component-no-mind-and-dead-text = { CAPITALIZE(POSS-ADJ($ent)) } soul has departed and moved on. Any recovery is unlikely.
+mind-component-mind-and-no-session-text = { CAPITALIZE(POSS-ADJ($ent)) } { CONJUGATE-HAVE($ent) } a blank, absent-minded stare and appears completely unresponsive to anything. { CAPITALIZE(POSS-ADJ($ent)) } may snap out of it soon.
description: Alas poor Yorick...
name: captain's skull
type: GhostTakeoverAvailable
- - type: MindContainer
+ - type: Mind
- type: InputMover
- type: MobMover
- type: MovementAlwaysTouching
name: revenant
description: A spooky ghostie.
components:
- - type: MindContainer
+ - type: Mind
- type: InputMover
- type: MobMover
- type: Input
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
- type: Access
tags:
- Chapel
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Alerts
- type: Familiar
- type: Access
tags:
- Chapel
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Familiar
- type: Vocal
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
save: false
description: Boo!
components:
- - type: MindContainer
+ - type: Mind
- type: Clickable
- type: InteractionOutline
- type: Physics
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
interactSuccessString: hugging-success-generic
interactSuccessSound: /Audio/Effects/thudswoosh.ogg
messagePerceivedByOthers: hugging-success-generic-others
- - type: MindContainer
+ - type: Mind
showExamineInfo: true
- type: Input
context: "human"
damageRecovery:
types:
Asphyxiation: -1.0
+