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

Interactable component system. (#9)

Browse Source 
* InteractableComponent v1. Broken edition

* It works!
This commit is contained in:
Pieter-Jan Briers
2017-10-06 21:05:21 +02:00
committed by GitHub
parent 8c1fa84c6e
commit 7597cd9172
8 changed files with 174 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Server/GameObjects/Components/Items/ItemComponent.cs
View File

@@ -1,7 +1,8 @@
using Content.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects;
using SS14.Server.Interfaces.GameObjects;
using SS14.Shared.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Log;
using System;
namespace Content.Server.GameObjects
@@ -12,6 +13,7 @@ namespace Content.Server.GameObjects
/// <inheritdoc />
public IInventorySlot ContainingSlot { get; private set; }
private IInteractableComponent interactableComponent;
public void RemovedFromSlot()
{
@@ -42,5 +44,39 @@ namespace Content.Server.GameObjects
component.Visible = false;
}
}
public override void Initialize()
{
if (Owner.TryGetComponent<IInteractableComponent>(out var interactable))
{
interactableComponent = interactable;
interactableComponent.OnAttackHand += InteractableComponent_OnAttackHand;
}
else
{
Logger.Error($"Item component must have an interactable component to function! Prototype: {Owner.Prototype.ID}");
}
base.Initialize();
}
private void InteractableComponent_OnAttackHand(object sender, AttackHandEventArgs e)
{
if (ContainingSlot != null)
{
return;
}
var hands = e.User.GetComponent<IHandsComponent>();
hands.PutInHand(this, e.HandIndex, fallback: false);
}
public override void Shutdown()
{
if (interactableComponent != null)
{
interactableComponent.OnAttackHand -= InteractableComponent_OnAttackHand;
interactableComponent = null;
}
base.Shutdown();
}
}
}

19
Content.Server/GameObjects/Components/Items/ServerHandsComponent.cs
View File

@@ -51,7 +51,6 @@ namespace Content.Server.GameObjects
}
Owner.SubscribeEvent<BoundKeyChangeEventArgs>(OnKeyChange, this);
Owner.SubscribeEvent<ClickedOnEntityEventArgs>(OnClick, this);
base.Initialize();
}
@@ -258,24 +257,6 @@ namespace Content.Server.GameObjects
ActiveIndex = orderedHands[index];
}
public void OnClick(object sender, EntityEventArgs uncast)
{
var cast = (ClickedOnEntityEventArgs)uncast;
if (cast.MouseButton != MouseClickType.Left || Owner.EntityManager.GetEntity(cast.Clicker) != Owner)
{
return;
}
var target = Owner.EntityManager.GetEntity(cast.Clicked);
var targetTransform = target.GetComponent<IServerTransformComponent>();
if (!target.TryGetComponent<IItemComponent>(out var item) || (targetTransform.WorldPosition - transform.WorldPosition).Length > PICKUP_RANGE)
{
return;
}
PutInHand(item, ActiveIndex, fallback: false);
}
public override void HandleNetworkMessage(IncomingEntityComponentMessage message, NetConnection sender)
{
if (message.MessageParameters.Count != 1)