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

Remove combat mode component reference (#15206)

Browse Source
This commit is contained in:
DrSmugleaf
2023-04-08 13:16:48 -07:00
committed by GitHub
parent b4164e62b1
commit 34bcd042d1
29 changed files with 126 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
View File

@@ -8,6 +8,7 @@ namespace Content.Server.NPC.Systems;
public sealed partial class NPCCombatSystem
{
[Dependency] private readonly SharedCombatModeSystem _combat = default!;
[Dependency] private readonly RotateToFaceSystem _rotate = default!;
// TODO: Don't predict for hitscan
@@ -26,9 +27,9 @@ public sealed partial class NPCCombatSystem
private void OnRangedStartup(EntityUid uid, NPCRangedCombatComponent component, ComponentStartup args)
{
if (TryComp<SharedCombatModeComponent>(uid, out var combat))
if (TryComp<CombatModeComponent>(uid, out var combat))
{
combat.IsInCombatMode = true;
_combat.SetInCombatMode(uid, true, combat);
}
else
{
@@ -38,9 +39,9 @@ public sealed partial class NPCCombatSystem
private void OnRangedShutdown(EntityUid uid, NPCRangedCombatComponent component, ComponentShutdown args)
{
if (TryComp<SharedCombatModeComponent>(uid, out var combat))
if (TryComp<CombatModeComponent>(uid, out var combat))
{
combat.IsInCombatMode = false;
_combat.SetInCombatMode(uid, false, combat);
}
}
@@ -48,7 +49,7 @@ public sealed partial class NPCCombatSystem
{
var bodyQuery = GetEntityQuery<PhysicsComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
var combatQuery = GetEntityQuery<SharedCombatModeComponent>();
var combatQuery = GetEntityQuery<CombatModeComponent>();
var query = EntityQueryEnumerator<NPCRangedCombatComponent, TransformComponent>();
while (query.MoveNext(out var uid, out var comp, out var xform))
@@ -73,7 +74,7 @@ public sealed partial class NPCCombatSystem
if (combatQuery.TryGetComponent(uid, out var combatMode))
{
combatMode.IsInCombatMode = true;
_combat.SetInCombatMode(uid, true, combatMode);
}
if (!_gun.TryGetGun(uid, out var gunUid, out var gun))