Skip to content

Commit

Permalink
Guardian bugfixes (space-wizards#21467)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElectroJr
ElectroJr committed Nov 7, 2023
1 parent 2a9e08b commit fb60a56
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 32 deletions.
10 changes: 6 additions & 4 deletions Content.Server/Guardian/GuardianComponent.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@ public sealed partial class GuardianComponent : Component
/// <summary>
/// The guardian host entity
/// </summary>
public EntityUid Host;
[DataField]
public EntityUid? Host;

/// <summary>
/// Percentage of damage reflected from the guardian to the host
/// </summary>
[DataField("damageShare")]
[DataField]
public float DamageShare { get; set; } = 0.65f;

/// <summary>
/// Maximum distance the guardian can travel before it's forced to recall, use YAML to set
/// </summary>
[DataField("distanceAllowed")]
[DataField]
public float DistanceAllowed { get; set; } = 5f;

/// <summary>
/// If the guardian is currently manifested
/// </summary>
public bool GuardianLoose = false;
[DataField]
public bool GuardianLoose;

}
}
8 changes: 4 additions & 4 deletions Content.Server/Guardian/GuardianHostComponent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Robust.Shared.Containers;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

namespace Content.Server.Guardian
{
Expand All @@ -16,16 +15,17 @@ public sealed partial class GuardianHostComponent : Component
/// <remarks>
/// Can be null if the component is added at any time.
/// </remarks>
[DataField]
public EntityUid? HostedGuardian;

/// <summary>
/// Container which holds the guardian
/// </summary>
[ViewVariables] public ContainerSlot GuardianContainer = default!;

[DataField("action", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string Action = "ActionToggleGuardian";
[DataField]
public EntProtoId Action = "ActionToggleGuardian";

[DataField("actionEntity")] public EntityUid? ActionEntity;
[DataField] public EntityUid? ActionEntity;
}
}
75 changes: 51 additions & 24 deletions Content.Server/Guardian/GuardianSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ public override void Initialize()
SubscribeLocalEvent<GuardianCreatorComponent, ExaminedEvent>(OnCreatorExamine);
SubscribeLocalEvent<GuardianCreatorComponent, GuardianCreatorDoAfterEvent>(OnDoAfter);

SubscribeLocalEvent<GuardianComponent, ComponentShutdown>(OnGuardianShutdown);
SubscribeLocalEvent<GuardianComponent, MoveEvent>(OnGuardianMove);
SubscribeLocalEvent<GuardianComponent, DamageChangedEvent>(OnGuardianDamaged);
SubscribeLocalEvent<GuardianComponent, PlayerAttachedEvent>(OnGuardianPlayer);
SubscribeLocalEvent<GuardianComponent, PlayerDetachedEvent>(OnGuardianUnplayer);
SubscribeLocalEvent<GuardianComponent, PlayerAttachedEvent>(OnGuardianPlayerAttached);
SubscribeLocalEvent<GuardianComponent, PlayerDetachedEvent>(OnGuardianPlayerDetached);

SubscribeLocalEvent<GuardianHostComponent, ComponentInit>(OnHostInit);
SubscribeLocalEvent<GuardianHostComponent, MoveEvent>(OnHostMove);
Expand All @@ -56,6 +57,21 @@ public override void Initialize()
SubscribeLocalEvent<GuardianComponent, AttackAttemptEvent>(OnGuardianAttackAttempt);
}

private void OnGuardianShutdown(EntityUid uid, GuardianComponent component, ComponentShutdown args)
{
var host = component.Host;
component.Host = null;

if (!TryComp(host, out GuardianHostComponent? hostComponent))
return;

hostComponent.GuardianContainer.Remove(uid);
hostComponent.HostedGuardian = null;
Dirty(host.Value, hostComponent);
QueueDel(hostComponent.ActionEntity);
hostComponent.ActionEntity = null;
}

private void OnPerformAction(EntityUid uid, GuardianHostComponent component, GuardianToggleActionEvent args)
{
if (args.Handled)
Expand All @@ -67,24 +83,29 @@ private void OnPerformAction(EntityUid uid, GuardianHostComponent component, Gua
args.Handled = true;
}

private void OnGuardianUnplayer(EntityUid uid, GuardianComponent component, PlayerDetachedEvent args)
private void OnGuardianPlayerDetached(EntityUid uid, GuardianComponent component, PlayerDetachedEvent args)
{
var host = component.Host;

if (!TryComp<GuardianHostComponent>(host, out var hostComponent) || LifeStage(host) >= EntityLifeStage.MapInitialized)
if (!TryComp<GuardianHostComponent>(host, out var hostComponent) || TerminatingOrDeleted(host.Value))
{
QueueDel(uid);
return;
}

RetractGuardian(host, hostComponent, uid, component);
RetractGuardian(host.Value, hostComponent, uid, component);
}

private void OnGuardianPlayer(EntityUid uid, GuardianComponent component, PlayerAttachedEvent args)
private void OnGuardianPlayerAttached(EntityUid uid, GuardianComponent component, PlayerAttachedEvent args)
{
var host = component.Host;

if (!HasComp<GuardianHostComponent>(host))
{
QueueDel(uid);
return;
}

_popupSystem.PopupEntity(Loc.GetString("guardian-available"), host, host);
_popupSystem.PopupEntity(Loc.GetString("guardian-available"), host.Value, host.Value);
}

private void OnHostInit(EntityUid uid, GuardianHostComponent component, ComponentInit args)
Expand All @@ -95,14 +116,16 @@ private void OnHostInit(EntityUid uid, GuardianHostComponent component, Componen

private void OnHostShutdown(EntityUid uid, GuardianHostComponent component, ComponentShutdown args)
{
if (component.HostedGuardian == null)
if (component.HostedGuardian is not {} guardian)
return;

if (HasComp<HandsComponent>(component.HostedGuardian.Value))
// Ensure held items are dropped before deleting guardian.
if (HasComp<HandsComponent>(guardian))
_bodySystem.GibBody(component.HostedGuardian.Value);

EntityManager.QueueDeleteEntity(component.HostedGuardian.Value);
_actionSystem.RemoveAction(uid, component.ActionEntity);
QueueDel(guardian);
QueueDel(component.ActionEntity);
component.ActionEntity = null;
}

private void OnGuardianAttackAttempt(EntityUid uid, GuardianComponent component, AttackAttemptEvent args)
Expand All @@ -117,7 +140,7 @@ private void OnGuardianAttackAttempt(EntityUid uid, GuardianComponent component,

public void ToggleGuardian(EntityUid user, GuardianHostComponent hostComponent)
{
if (hostComponent.HostedGuardian == null || !TryComp<GuardianComponent>(hostComponent.HostedGuardian, out var guardianComponent))
if (!TryComp<GuardianComponent>(hostComponent.HostedGuardian, out var guardianComponent))
return;

if (guardianComponent.GuardianLoose)
Expand All @@ -134,7 +157,7 @@ private void OnCreatorUse(EntityUid uid, GuardianCreatorComponent component, Use
if (args.Handled)
return;

//args.Handled = true;
args.Handled = true;
UseCreator(args.User, args.User, uid, component);
}

Expand All @@ -143,7 +166,7 @@ private void OnCreatorInteract(EntityUid uid, GuardianCreatorComponent component
if (args.Handled || args.Target == null || !args.CanReach)
return;

//args.Handled = true;
args.Handled = true;
UseCreator(args.User, args.Target.Value, uid, component);
}
private void UseCreator(EntityUid user, EntityUid target, EntityUid injector, GuardianCreatorComponent component)
Expand Down Expand Up @@ -194,15 +217,16 @@ private void OnDoAfter(EntityUid uid, GuardianCreatorComponent component, DoAfte
if (TryComp<GuardianComponent>(guardian, out var guardianComp))
{
guardianComp.Host = args.Args.Target.Value;
// TODO this should be a data field, not a hardcoded path
_audio.Play("/Audio/Effects/guardian_inject.ogg", Filter.Pvs(args.Args.Target.Value), args.Args.Target.Value, true);
_popupSystem.PopupEntity(Loc.GetString("guardian-created"), args.Args.Target.Value, args.Args.Target.Value);
// Exhaust the activator
component.Used = true;
}
else
{
Logger.ErrorS("guardian", $"Tried to spawn a guardian that doesn't have {nameof(GuardianComponent)}");
EntityManager.QueueDeleteEntity(guardian);
Log.Error($"Tried to spawn a guardian that doesn't have {nameof(GuardianComponent)}");
QueueDel(guardian);
}

args.Handled = true;
Expand All @@ -219,13 +243,14 @@ private void OnHostStateChange(EntityUid uid, GuardianHostComponent component, M
if (args.NewMobState == MobState.Critical)
{
_popupSystem.PopupEntity(Loc.GetString("guardian-host-critical-warn"), component.HostedGuardian.Value, component.HostedGuardian.Value);
// TODO this should be a data field, not a hardcoded path
_audio.Play("/Audio/Effects/guardian_warn.ogg", Filter.Pvs(component.HostedGuardian.Value), component.HostedGuardian.Value, true);
}
else if (args.NewMobState == MobState.Dead)
{
//TODO: Replace WithVariation with datafield
_audio.Play("/Audio/Voice/Human/malescream_guardian.ogg", Filter.Pvs(uid), uid, true, AudioHelpers.WithVariation(0.20f));
EntityManager.RemoveComponent<GuardianHostComponent>(uid);
RemComp<GuardianHostComponent>(uid);
}
}

Expand All @@ -234,11 +259,11 @@ private void OnHostStateChange(EntityUid uid, GuardianHostComponent component, M
/// </summary>
private void OnGuardianDamaged(EntityUid uid, GuardianComponent component, DamageChangedEvent args)
{
if (args.DamageDelta == null)
if (args.DamageDelta == null || component.Host == null || component.DamageShare > 0)
return;

_damageSystem.TryChangeDamage(component.Host, args.DamageDelta * component.DamageShare, origin: args.Origin);
_popupSystem.PopupEntity(Loc.GetString("guardian-entity-taking-damage"), component.Host, component.Host);
_popupSystem.PopupEntity(Loc.GetString("guardian-entity-taking-damage"), component.Host.Value, component.Host.Value);

}

Expand All @@ -256,8 +281,7 @@ private void OnCreatorExamine(EntityUid uid, GuardianCreatorComponent component,
/// </summary>
private void OnHostMove(EntityUid uid, GuardianHostComponent component, ref MoveEvent args)
{
if (component.HostedGuardian == null ||
!TryComp(component.HostedGuardian, out GuardianComponent? guardianComponent) ||
if (!TryComp(component.HostedGuardian, out GuardianComponent? guardianComponent) ||
!guardianComponent.GuardianLoose)
{
return;
Expand All @@ -271,10 +295,10 @@ private void OnHostMove(EntityUid uid, GuardianHostComponent component, ref Move
/// </summary>
private void OnGuardianMove(EntityUid uid, GuardianComponent component, ref MoveEvent args)
{
if (!component.GuardianLoose)
if (!component.GuardianLoose || component.Host == null)
return;

CheckGuardianMove(component.Host, uid, guardianComponent: component);
CheckGuardianMove(component.Host.Value, uid, guardianComponent: component);
}

/// <summary>
Expand All @@ -288,6 +312,9 @@ private void CheckGuardianMove(
TransformComponent? hostXform = null,
TransformComponent? guardianXform = null)
{
if (TerminatingOrDeleted(guardianUid) || TerminatingOrDeleted(hostUid))
return;

if (!Resolve(hostUid, ref hostComponent, ref hostXform) ||
!Resolve(guardianUid, ref guardianComponent, ref guardianXform))
{
Expand Down

0 comments on commit fb60a56

Please sign in to comment.