Sentry turrets - Part 4: The sentry turret and its primary systems (#35123)

* Initial commit

* Removed mention of StationAiTurretComponent (for now)

* Prep for moving out of draft

* Fixing merge conflict

* Re-added new net frequencies to AI turrets

* Removed turret control content

* Removed unintended change

* Final tweaks

* Fixed incorrect file name

* Improvement to fire mode handling

* Addressed review comments

* Updated how turret wire panel auto-closing is handled

* Ranged NPCs no longer waste shots on stunned targets

* Fixed bug in tracking broken state

* Addressed review comments

* Bug fix

* Removed unnecessary event call
This commit is contained in:
chromiumboy
2025-03-29 12:55:58 -05:00
committed by GitHub
parent 587afe7598
commit dfd3e36a0a
24 changed files with 1005 additions and 30 deletions

View File

@@ -9,8 +9,17 @@ namespace Content.Server.Destructible
[RegisterComponent]
public sealed partial class DestructibleComponent : Component
{
[DataField("thresholds")]
/// <summary>
/// A list of damage thresholds for the entity;
/// includes their triggers and resultant behaviors
/// </summary>
[DataField]
public List<DamageThreshold> Thresholds = new();
/// <summary>
/// Specifies whether the entity has passed a damage threshold that causes it to break
/// </summary>
[DataField]
public bool IsBroken = false;
}
}

View File

@@ -57,6 +57,8 @@ namespace Content.Server.Destructible
/// </summary>
public void Execute(EntityUid uid, DestructibleComponent component, DamageChangedEvent args)
{
component.IsBroken = false;
foreach (var threshold in component.Thresholds)
{
if (threshold.Reached(args.Damageable, this))
@@ -96,6 +98,12 @@ namespace Content.Server.Destructible
threshold.Execute(uid, this, EntityManager, args.Origin);
}
if (threshold.OldTriggered)
{
component.IsBroken |= threshold.Behaviors.Any(b => b is DoActsBehavior doActsBehavior &&
(doActsBehavior.HasAct(ThresholdActs.Breakage) || doActsBehavior.HasAct(ThresholdActs.Destruction)));
}
// if destruction behavior (or some other deletion effect) occurred, don't run other triggers.
if (EntityManager.IsQueuedForDeletion(uid) || Deleted(uid))
return;

View File

@@ -0,0 +1,10 @@
namespace Content.Server.NPC.Queries.Considerations;
/// <summary>
/// Returns 1f if the target has the <see cref="StunnedComponent"/>
/// </summary>
public sealed partial class TargetIsStunnedCon : UtilityConsideration
{
}

View File

@@ -19,6 +19,7 @@ using Content.Shared.Mobs.Systems;
using Content.Shared.NPC.Systems;
using Content.Shared.Nutrition.Components;
using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Stunnable;
using Content.Shared.Tools.Systems;
using Content.Shared.Turrets;
using Content.Shared.Weapons.Melee;
@@ -360,6 +361,10 @@ public sealed class NPCUtilitySystem : EntitySystem
return 1f;
return 0f;
}
case TargetIsStunnedCon:
{
return HasComp<StunnedComponent>(targetUid) ? 1f : 0f;
}
case TurretTargetingCon:
{
if (!TryComp<TurretTargetSettingsComponent>(owner, out var turretTargetSettings) ||

View File

@@ -0,0 +1,175 @@
using Content.Server.Destructible;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Components;
using Content.Server.DeviceNetwork.Systems;
using Content.Server.NPC.HTN;
using Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Ranged;
using Content.Server.Power.Components;
using Content.Server.Repairable;
using Content.Shared.Destructible;
using Content.Shared.DeviceNetwork;
using Content.Shared.Power;
using Content.Shared.Turrets;
using Content.Shared.Weapons.Ranged.Events;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Timing;
namespace Content.Server.Turrets;
public sealed partial class DeployableTurretSystem : SharedDeployableTurretSystem
{
[Dependency] private readonly HTNSystem _htn = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!;
[Dependency] private readonly IGameTiming _timing = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<DeployableTurretComponent, AmmoShotEvent>(OnAmmoShot);
SubscribeLocalEvent<DeployableTurretComponent, ChargeChangedEvent>(OnChargeChanged);
SubscribeLocalEvent<DeployableTurretComponent, PowerChangedEvent>(OnPowerChanged);
SubscribeLocalEvent<DeployableTurretComponent, BreakageEventArgs>(OnBroken);
SubscribeLocalEvent<DeployableTurretComponent, RepairedEvent>(OnRepaired);
SubscribeLocalEvent<DeployableTurretComponent, BeforeBroadcastAttemptEvent>(OnBeforeBroadcast);
}
private void OnAmmoShot(Entity<DeployableTurretComponent> ent, ref AmmoShotEvent args)
{
UpdateAmmoStatus(ent);
}
private void OnChargeChanged(Entity<DeployableTurretComponent> ent, ref ChargeChangedEvent args)
{
UpdateAmmoStatus(ent);
}
private void OnPowerChanged(Entity<DeployableTurretComponent> ent, ref PowerChangedEvent args)
{
UpdateAmmoStatus(ent);
}
private void OnBroken(Entity<DeployableTurretComponent> ent, ref BreakageEventArgs args)
{
if (TryComp<AppearanceComponent>(ent, out var appearance))
_appearance.SetData(ent, DeployableTurretVisuals.Broken, true, appearance);
SetState(ent, false);
}
private void OnRepaired(Entity<DeployableTurretComponent> ent, ref RepairedEvent args)
{
if (TryComp<AppearanceComponent>(ent, out var appearance))
_appearance.SetData(ent, DeployableTurretVisuals.Broken, false, appearance);
}
private void OnBeforeBroadcast(Entity<DeployableTurretComponent> ent, ref BeforeBroadcastAttemptEvent args)
{
if (!TryComp<DeviceNetworkComponent>(ent, out var deviceNetwork))
return;
var recipientDeviceNetworks = new HashSet<DeviceNetworkComponent>();
// Only broadcast to connected devices
foreach (var recipient in deviceNetwork.DeviceLists)
{
if (!TryComp<DeviceNetworkComponent>(recipient, out var recipientDeviceNetwork))
continue;
recipientDeviceNetworks.Add(recipientDeviceNetwork);
}
if (recipientDeviceNetworks.Count > 0)
args.ModifiedRecipients = recipientDeviceNetworks;
}
private void SendStateUpdateToDeviceNetwork(Entity<DeployableTurretComponent> ent)
{
if (!TryComp<DeviceNetworkComponent>(ent, out var device))
return;
var payload = new NetworkPayload
{
[DeviceNetworkConstants.Command] = DeviceNetworkConstants.CmdUpdatedState,
[DeviceNetworkConstants.CmdUpdatedState] = GetTurretState(ent)
};
_deviceNetwork.QueuePacket(ent, null, payload, device: device);
}
protected override void SetState(Entity<DeployableTurretComponent> ent, bool enabled, EntityUid? user = null)
{
if (ent.Comp.Enabled == enabled)
return;
base.SetState(ent, enabled, user);
DirtyField(ent, ent.Comp, nameof(DeployableTurretComponent.Enabled));
// Determine how much time is remaining in the current animation and the one next in queue
var animTimeRemaining = MathF.Max((float)(ent.Comp.AnimationCompletionTime - _timing.CurTime).TotalSeconds, 0f);
var animTimeNext = ent.Comp.Enabled ? ent.Comp.DeploymentLength : ent.Comp.RetractionLength;
// End/restart any tasks the NPC was doing
// Delay the resumption of any tasks based on the total animation length (plus a buffer)
var planCooldown = animTimeRemaining + animTimeNext + 0.5f;
if (TryComp<HTNComponent>(ent, out var htn))
_htn.SetHTNEnabled((ent, htn), ent.Comp.Enabled, planCooldown);
// Play audio
_audio.PlayPvs(ent.Comp.Enabled ? ent.Comp.DeploymentSound : ent.Comp.RetractionSound, ent, new AudioParams { Volume = -10f });
}
private void UpdateAmmoStatus(Entity<DeployableTurretComponent> ent)
{
if (!HasAmmo(ent))
SetState(ent, false);
}
private DeployableTurretState GetTurretState(Entity<DeployableTurretComponent> ent, DestructibleComponent? destructable = null, HTNComponent? htn = null)
{
Resolve(ent, ref destructable, ref htn);
if (destructable?.IsBroken == true)
return DeployableTurretState.Broken;
if (htn == null || !HasAmmo(ent))
return DeployableTurretState.Disabled;
if (htn.Plan?.CurrentTask.Operator is GunOperator)
return DeployableTurretState.Firing;
if (ent.Comp.AnimationCompletionTime > _timing.CurTime)
return ent.Comp.Enabled ? DeployableTurretState.Deploying : DeployableTurretState.Retracting;
return ent.Comp.Enabled ? DeployableTurretState.Deployed : DeployableTurretState.Retracted;
}
public override void Update(float frameTime)
{
base.Update(frameTime);
var query = EntityQueryEnumerator<DeployableTurretComponent, DestructibleComponent, HTNComponent>();
while (query.MoveNext(out var uid, out var deployableTurret, out var destructible, out var htn))
{
// Check if the turret state has changed since the last update,
// and if it has, inform the device network
var ent = new Entity<DeployableTurretComponent>(uid, deployableTurret);
var newState = GetTurretState(ent, destructible, htn);
if (newState != deployableTurret.CurrentState)
{
deployableTurret.CurrentState = newState;
DirtyField(uid, deployableTurret, nameof(DeployableTurretComponent.CurrentState));
SendStateUpdateToDeviceNetwork(ent);
if (TryComp<AppearanceComponent>(ent, out var appearance))
_appearance.SetData(ent, DeployableTurretVisuals.Turret, newState, appearance);
}
}
}
}