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

Melee refactor (#10897)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-09-29 15:51:59 +10:00
committed by GitHub
parent c583b7b361
commit f51248ecaa
140 changed files with 2440 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
View File

@@ -1,8 +1,8 @@
using Content.Server.CombatMode;
using Content.Server.NPC.Components;
using Content.Server.Weapon.Melee.Components;
using Content.Shared.MobState;
using Content.Shared.MobState.Components;
using Content.Shared.Weapons.Melee;
namespace Content.Server.NPC.Systems;
@@ -64,7 +64,7 @@ public sealed partial class NPCCombatSystem
return;
}
if (weapon.CooldownEnd > _timing.CurTime)
if (weapon.NextAttack > _timing.CurTime)
{
return;
}
@@ -84,6 +84,6 @@ public sealed partial class NPCCombatSystem
return;
}
_interaction.DoAttack(component.Owner, targetXform.Coordinates, false, component.Target);
_melee.AttemptLightAttack(component.Owner, weapon, component.Target);
}
}