Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1184 from ShadowCommander/UnarmedAttack

Browse Source 
Implement unarmed combat
This commit is contained in:
ShadowCommander
2020-06-23 08:17:32 -07:00
committed by GitHub
parent 2fb2cea29f 264d3d3942
commit 5a6417cadf
6 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.Components.Timing;
@@ -955,22 +955,34 @@ namespace Content.Server.GameObjects.EntitySystems
return;
}
// Verify player has a hand, and find what object he is currently holding in his active hand
if (!player.TryGetComponent<IHandsComponent>(out var hands))
{
return;
}
var item = hands.GetActiveHand?.Owner;
// TODO: If item is null we need some kinda unarmed combat.
if (!ActionBlockerSystem.CanAttack(player) || item == null)
if (!ActionBlockerSystem.CanAttack(player))
{
return;
}
var eventArgs = new AttackEventArgs(player, coordinates);
foreach (var attackComponent in item.GetAllComponents<IAttack>())
// Verify player has a hand, and find what object he is currently holding in his active hand
if (player.TryGetComponent<IHandsComponent>(out var hands))
{
var item = hands.GetActiveHand?.Owner;
if (item != null)
{
var attacked = false;
foreach (var attackComponent in item.GetAllComponents<IAttack>())
{
attackComponent.Attack(eventArgs);
attacked = true;
}
if (attacked)
{
return;
}
}
}
foreach (var attackComponent in player.GetAllComponents<IAttack>())
{
attackComponent.Attack(eventArgs);
}