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

Refactor PacificationSystem (#18715)

Browse Source
This commit is contained in:
Vordenburg
2023-08-05 17:27:12 -04:00
committed by GitHub
parent 42ed9dd550
commit 28fe9d9f33
10 changed files with 80 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Content.Shared/CombatMode/Pacification/PacificationSystem.cs
View File

@@ -1,52 +1,57 @@
using Content.Shared.Actions;
using Content.Shared.Alert;
using Content.Shared.Interaction.Events;
using Content.Shared.Popups;
namespace Content.Shared.CombatMode.Pacification
namespace Content.Shared.CombatMode.Pacification;
public sealed class PacificationSystem : EntitySystem
{
public sealed class PacificationSystem : EntitySystem
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly SharedCombatModeSystem _combatSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
public override void Initialize()
{
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly SharedCombatModeSystem _combatSystem = default!;
base.Initialize();
SubscribeLocalEvent<PacifiedComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<PacifiedComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<PacifiedComponent, AttackAttemptEvent>(OnAttackAttempt);
}
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<PacifiedComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<PacifiedComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<PacifiedComponent, AttackAttemptEvent>(OnAttackAttempt);
}
private void OnAttackAttempt(EntityUid uid, PacifiedComponent component, AttackAttemptEvent args)
{
args.Cancel();
}
private void OnAttackAttempt(EntityUid uid, PacifiedComponent component, AttackAttemptEvent args)
{
args.Cancel();
}
private void OnStartup(EntityUid uid, PacifiedComponent component, ComponentStartup args)
{
if (!TryComp<CombatModeComponent>(uid, out var combatMode))
return;
private void OnStartup(EntityUid uid, PacifiedComponent component, ComponentStartup args)
{
if (!TryComp<CombatModeComponent>(uid, out var combatMode))
return;
if (combatMode.CanDisarm != null)
_combatSystem.SetCanDisarm(uid, false, combatMode);
if (combatMode.CanDisarm != null)
_combatSystem.SetCanDisarm(uid, false, combatMode);
_combatSystem.SetInCombatMode(uid, false, combatMode);
_combatSystem.SetInCombatMode(uid, false, combatMode);
if (combatMode.CombatToggleAction != null)
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, false);
if (combatMode.CombatToggleAction != null)
{
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, false);
}
}
_alertsSystem.ShowAlert(uid, AlertType.Pacified);
}
private void OnShutdown(EntityUid uid, PacifiedComponent component, ComponentShutdown args)
{
if (!TryComp<CombatModeComponent>(uid, out var combatMode))
return;
private void OnShutdown(EntityUid uid, PacifiedComponent component, ComponentShutdown args)
{
if (!TryComp<CombatModeComponent>(uid, out var combatMode))
return;
if (combatMode.CanDisarm != null)
_combatSystem.SetCanDisarm(uid, true, combatMode);
if (combatMode.CanDisarm != null)
_combatSystem.SetCanDisarm(uid, true, combatMode);
if (combatMode.CombatToggleAction != null)
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, true);
}
if (combatMode.CombatToggleAction != null)
_actionsSystem.SetEnabled(combatMode.CombatToggleAction, true);
_alertsSystem.ClearAlert(uid, AlertType.Pacified);
}
}

18
Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
View File

@@ -1,13 +1,13 @@
using Robust.Shared.GameStates;
namespace Content.Shared.CombatMode.Pacification
{
/// <summary>
/// Status effect that disables combat mode.
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed class PacifiedComponent : Component
{
namespace Content.Shared.CombatMode.Pacification;
/// <summary>
/// Status effect that disables combat mode.
/// </summary>
[RegisterComponent, NetworkedComponent]
[Access(typeof(PacificationSystem))]
public sealed class PacifiedComponent : Component
{
}
}