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

Cloning rework (#3808)

Browse Source 
* Fix cloning

* Fix cloning after clone dies and remove unneeded code

* Fix ignored

Co-authored-by: Silver <silvertorch5@gmail.com>
This commit is contained in:
ShadowCommander
2021-05-11 16:16:08 -07:00
committed by GitHub
parent d41fc24834
commit c2d66723a3
8 changed files with 191 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/IgnoredComponents.cs
View File

@@ -253,6 +253,7 @@ namespace Content.Client
"SpawnAfterInteract",
"DisassembleOnActivate",
"ExplosionLaunched",
"BeingCloned",
"Advertise",
};
}

18
Content.Server/GameObjects/Components/Medical/BeingClonedComponent.cs Normal file
View File

@@ -0,0 +1,18 @@
using Content.Server.Mobs;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Medical
{
[RegisterComponent]
public class BeingClonedComponent : Component
{
public override string Name => "BeingCloned";
[ViewVariables]
public Mind? Mind = default;
[ViewVariables]
public EntityUid Parent;
}
}

178
Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
using System;
using Content.Server.Eui;
using Content.Server.GameObjects.Components.Mobs;
@@ -10,14 +9,12 @@ using Content.Server.Mobs;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Medical;
using Content.Shared.GameObjects.Components.Mobs.State;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Preferences;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Network;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -25,70 +22,42 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Medical
{
[RegisterComponent]
[ComponentReference(typeof(IActivate))]
public class CloningPodComponent : SharedCloningPodComponent, IActivate
public class CloningPodComponent : SharedCloningPodComponent
{
[Dependency] private readonly IServerPreferencesManager _prefsManager = null!;
[Dependency] private readonly IPlayerManager _playerManager = null!;
[Dependency] private readonly EuiManager _euiManager = null!;
[ViewVariables]
private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
public bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
[ViewVariables]
private BoundUserInterface? UserInterface =>
public BoundUserInterface? UserInterface =>
Owner.GetUIOrNull(CloningPodUIKey.Key);
private ContainerSlot _bodyContainer = default!;
private Mind? _capturedMind;
private CloningPodStatus _status;
private float _cloningProgress = 0;
[ViewVariables] public ContainerSlot BodyContainer = default!;
[ViewVariables] public Mind? CapturedMind;
[ViewVariables] public float CloningProgress = 0;
[DataField("cloningTime")]
private float _cloningTime = 120f;
[ViewVariables] public float CloningTime = 30f;
[ViewVariables]
public CloningPodStatus Status;
public override void Initialize()
{
base.Initialize();
if (UserInterface != null)
{
UserInterface.OnReceiveMessage += OnUiReceiveMessage;
}
_bodyContainer = ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, $"{Name}-bodyContainer");
BodyContainer = ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, $"{Name}-bodyContainer");
//TODO: write this so that it checks for a change in power events for GORE POD cases
var newState = GetUserInterfaceState();
UserInterface?.SetState(newState);
UpdateUserInterface();
Owner.EntityManager.EventBus.SubscribeEvent<GhostComponent.GhostReturnMessage>(EventSource.Local, this,
HandleGhostReturn);
}
public void Update(float frameTime)
{
if (_bodyContainer.ContainedEntity != null &&
Powered)
{
_cloningProgress += frameTime;
_cloningProgress = MathHelper.Clamp(_cloningProgress, 0f, _cloningTime);
}
if (_cloningProgress >= _cloningTime &&
_bodyContainer.ContainedEntity != null &&
_capturedMind?.Session?.AttachedEntity == _bodyContainer.ContainedEntity &&
Powered)
{
_bodyContainer.Remove(_bodyContainer.ContainedEntity);
_capturedMind = null;
_cloningProgress = 0f;
_status = CloningPodStatus.Idle;
UpdateAppearance();
}
UpdateUserInterface();
if (UserInterface != null)
EntitySystem.Get<CloningSystem>().UpdateUserInterface(this);
}
public override void OnRemove()
@@ -98,45 +67,17 @@ namespace Content.Server.GameObjects.Components.Medical
UserInterface.OnReceiveMessage -= OnUiReceiveMessage;
}
Owner.EntityManager.EventBus.UnsubscribeEvent<GhostComponent.GhostReturnMessage>(EventSource.Local, this);
base.OnRemove();
}
private void UpdateUserInterface()
{
if (!Powered) return;
UserInterface?.SetState(GetUserInterfaceState());
}
private CloningPodBoundUserInterfaceState GetUserInterfaceState()
{
var idToUser = EntitySystem.Get<CloningSystem>().GetIdToUser();
return new CloningPodBoundUserInterfaceState(idToUser, _cloningProgress,
(_status == CloningPodStatus.Cloning));
}
private void UpdateAppearance()
{
if (Owner.TryGetComponent(out AppearanceComponent? appearance))
{
appearance.SetData(CloningPodVisuals.Status, _status);
appearance.SetData(CloningPodVisuals.Status, Status);
}
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!Powered ||
!eventArgs.User.TryGetComponent(out IActorComponent? actor))
{
return;
}
UserInterface?.Open(actor.playerSession);
}
private void OnUiReceiveMessage(ServerBoundUserInterfaceMessage obj)
{
if (obj.Message is not CloningPodUiButtonPressedMessage message) return;
@@ -144,49 +85,60 @@ namespace Content.Server.GameObjects.Components.Medical
switch (message.Button)
{
case UiButton.Clone:
if (message.ScanId == null) return;
if (message.ScanId == null || BodyContainer.ContainedEntity != null)
return;
var cloningSystem = EntitySystem.Get<CloningSystem>();
if (_bodyContainer.ContainedEntity != null ||
!cloningSystem.Minds.TryGetValue(message.ScanId.Value, out var mind))
if (!cloningSystem.Minds.TryGetValue(message.ScanId.Value, out var mind))
{
return;
return; // ScanId is not in database
}
var dead =
mind.OwnedEntity != null &&
mind.OwnedEntity.TryGetComponent<IMobStateComponent>(out var state) &&
state.IsDead();
if (!dead) return;
if (cloningSystem.ClonesWaitingForMind.TryGetValue(mind, out var cloneUid))
{
if (Owner.EntityManager.TryGetEntity(cloneUid, out var clone) &&
clone.TryGetComponent<IMobStateComponent>(out var cloneState) &&
!cloneState.IsDead() &&
clone.TryGetComponent(out MindComponent? cloneMindComp) &&
(cloneMindComp.Mind == null || cloneMindComp.Mind == mind))
return; // Mind already has clone
cloningSystem.ClonesWaitingForMind.Remove(mind);
}
if (mind.OwnedEntity != null &&
mind.OwnedEntity.TryGetComponent<IMobStateComponent>(out var state) &&
!state.IsDead())
return; // Body controlled by mind is not dead
// TODO: Implement ClonerDNAEntry and get the profile appearance and name when scanned
if (mind.UserId == null || !_playerManager.TryGetSessionById(mind.UserId.Value, out var client))
return;
var mob = Owner.EntityManager.SpawnEntity("HumanMob_Content", Owner.Transform.MapPosition);
var client = _playerManager.GetSessionByUserId(mind.UserId!.Value);
var profile = GetPlayerProfileAsync(client.UserId);
mob.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
mob.Name = profile.Name;
_bodyContainer.Insert(mob);
_capturedMind = mind;
var cloneMindReturn = mob.AddComponent<BeingClonedComponent>();
cloneMindReturn.Mind = mind;
cloneMindReturn.Parent = Owner.Uid;
_status = CloningPodStatus.NoMind;
BodyContainer.Insert(mob);
CapturedMind = mind;
cloningSystem.ClonesWaitingForMind.Add(mind, mob.Uid);
var acceptMessage = new AcceptCloningEui(mob);
UpdateStatus(CloningPodStatus.NoMind);
var acceptMessage = new AcceptCloningEui(mind);
_euiManager.OpenEui(acceptMessage, client);
UpdateAppearance();
break;
case UiButton.Eject:
if (_bodyContainer.ContainedEntity == null || _cloningProgress < _cloningTime) break;
_bodyContainer.Remove(_bodyContainer.ContainedEntity!);
_capturedMind = null;
_cloningProgress = 0f;
_status = CloningPodStatus.Idle;
UpdateAppearance();
Eject();
break;
default:
@@ -194,21 +146,29 @@ namespace Content.Server.GameObjects.Components.Medical
}
}
public void Eject()
{
var entity = BodyContainer.ContainedEntity;
if (entity == null || CloningProgress < CloningTime)
return;
entity.RemoveComponent<BeingClonedComponent>();
BodyContainer.Remove(entity!);
CapturedMind = null;
CloningProgress = 0f;
UpdateStatus(CloningPodStatus.Idle);
}
public void UpdateStatus(CloningPodStatus status)
{
Status = status;
UpdateAppearance();
EntitySystem.Get<CloningSystem>().UpdateUserInterface(this);
}
private HumanoidCharacterProfile GetPlayerProfileAsync(NetUserId userId)
{
return (HumanoidCharacterProfile) _prefsManager.GetPreferences(userId).SelectedCharacter;
}
private void HandleGhostReturn(GhostComponent.GhostReturnMessage message)
{
if (message.Sender == _capturedMind)
{
//Transfer the mind to the new mob
_capturedMind.TransferTo(_bodyContainer.ContainedEntity);
_status = CloningPodStatus.Cloning;
UpdateAppearance();
}
}
}
}

5
Content.Server/GameObjects/Components/Mobs/MindComponent.cs
View File

@@ -71,6 +71,7 @@ namespace Content.Server.GameObjects.Components.Mobs
public void InternalAssignMind(Mind value)
{
Mind = value;
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MindAddedMessage());
}
protected override void Shutdown()
@@ -156,4 +157,8 @@ namespace Content.Server.GameObjects.Components.Mobs
public class MindRemovedMessage : EntityEventArgs
{
}
public class MindAddedMessage : EntityEventArgs
{
}
}

20
Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs
View File

@@ -1,6 +1,6 @@
#nullable enable
using Content.Server.Eui;
using Content.Server.Players;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Mobs;
using Content.Shared.Eui;
using Content.Shared.GameObjects.Components.Observer;
using Robust.Shared.GameObjects;
@@ -9,28 +9,26 @@ namespace Content.Server.GameObjects.Components.Observer
{
public class AcceptCloningEui : BaseEui
{
private readonly IEntity _newMob;
private readonly Mind _mind;
public AcceptCloningEui(IEntity newMob)
public AcceptCloningEui(Mind mind)
{
_newMob = newMob;
_mind = mind;
}
public override void HandleMessage(EuiMessageBase msg)
{
base.HandleMessage(msg);
if (msg is not AcceptCloningChoiceMessage choice
|| choice.Button == AcceptCloningUiButton.Deny
|| _newMob.Deleted)
if (msg is not AcceptCloningChoiceMessage choice ||
choice.Button == AcceptCloningUiButton.Deny ||
!EntitySystem.TryGet<CloningSystem>(out var cloningSystem))
{
Close();
return;
}
var mind = Player.ContentData()?.Mind;
mind?.TransferTo(_newMob);
mind?.UnVisit();
cloningSystem.TransferMindToClone(_mind);
Close();
}
}

17
Content.Server/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -95,13 +95,6 @@ namespace Content.Server.GameObjects.Components.Observer
}
break;
}
case ReturnToCloneComponentMessage _:
if (Owner.TryGetComponent(out VisitingMindComponent? mind) && mind.Mind != null)
{
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new GhostReturnMessage(mind.Mind));
}
break;
case GhostWarpToLocationRequestMessage warp:
{
if (session?.AttachedEntity != Owner)
@@ -191,15 +184,5 @@ namespace Content.Server.GameObjects.Components.Observer
message.AddMarkup(Loc.GetString("Died [color=yellow]{0}[/color].", deathTimeInfo));
}
public class GhostReturnMessage : EntityEventArgs
{
public GhostReturnMessage(Mind sender)
{
Sender = sender;
}
public Mind Sender { get; }
}
}
}

93
Content.Server/GameObjects/EntitySystems/CloningSystem.cs
View File

@@ -1,23 +1,107 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Medical;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using Content.Server.Mobs;
using Content.Shared.GameTicking;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
namespace Content.Server.GameObjects.EntitySystems
{
internal sealed class CloningSystem : EntitySystem, IResettingEntitySystem
{
public readonly Dictionary<int, Mind> Minds = new();
public readonly Dictionary<Mind, EntityUid> ClonesWaitingForMind = new();
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<CloningPodComponent, ActivateInWorldMessage>(HandleActivate);
SubscribeLocalEvent<BeingClonedComponent, MindAddedMessage>(HandleMindAdded);
}
public override void Shutdown()
{
base.Shutdown();
UnsubscribeLocalEvent<CloningPodComponent, ActivateInWorldMessage>(HandleActivate);
UnsubscribeLocalEvent<BeingClonedComponent, MindAddedMessage>(HandleMindAdded);
}
internal void TransferMindToClone(Mind mind)
{
if (!ClonesWaitingForMind.TryGetValue(mind, out var entityUid) ||
!EntityManager.TryGetEntity(entityUid, out var entity) ||
!entity.TryGetComponent(out MindComponent? mindComp) ||
mindComp.Mind != null)
return;
mind?.TransferTo(entity);
mind?.UnVisit();
}
private void HandleActivate(EntityUid uid, CloningPodComponent component, ActivateInWorldMessage args)
{
if (!component.Powered ||
!args.User.TryGetComponent(out IActorComponent? actor))
{
return;
}
component.UserInterface?.Open(actor.playerSession);
}
private void HandleMindAdded(EntityUid uid, BeingClonedComponent component, MindAddedMessage message)
{
if (component.Parent == EntityUid.Invalid ||
!EntityManager.TryGetEntity(component.Parent, out var parent) ||
!parent.TryGetComponent<CloningPodComponent>(out var cloningPodComponent) ||
component.Owner != cloningPodComponent.BodyContainer?.ContainedEntity)
{
component.Owner.RemoveComponent<BeingClonedComponent>();
return;
}
cloningPodComponent.UpdateStatus(CloningPodStatus.Cloning);
}
public override void Update(float frameTime)
{
foreach (var comp in ComponentManager.EntityQuery<CloningPodComponent>(true))
foreach (var (cloning, power) in ComponentManager.EntityQuery<CloningPodComponent, PowerReceiverComponent>(true))
{
comp.Update(frameTime);
if (!power.Powered)
return;
if (cloning.BodyContainer.ContainedEntity != null)
{
cloning.CloningProgress += frameTime;
cloning.CloningProgress = MathHelper.Clamp(cloning.CloningProgress, 0f, cloning.CloningTime);
}
if (cloning.CapturedMind?.Session?.AttachedEntity == cloning.BodyContainer.ContainedEntity)
{
cloning.Eject();
}
UpdateUserInterface(cloning);
}
}
public readonly Dictionary<int, Mind> Minds = new();
public void UpdateUserInterface(CloningPodComponent comp)
{
var idToUser = GetIdToUser();
comp.UserInterface?.SetState(
new CloningPodBoundUserInterfaceState(
idToUser,
comp.CloningProgress,
comp.Status == CloningPodStatus.Cloning));
}
public void AddToDnaScans(Mind mind)
{
@@ -40,6 +124,7 @@ namespace Content.Server.GameObjects.EntitySystems
public void Reset()
{
Minds.Clear();
ClonesWaitingForMind.Clear();
}
}
}

7
Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
View File

@@ -81,13 +81,6 @@ namespace Content.Shared.GameObjects.Components.Observer
Directed = true;
}
}
[Serializable, NetSerializable]
public class ReturnToCloneComponentMessage : ComponentMessage
{
public ReturnToCloneComponentMessage() => Directed = true;
}
}