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

HandsSystem now uses InputSystem. (#95)

Browse Source 
Fixed TemperatureSystem namespace.
This commit is contained in:
Acruid
2018-08-18 15:28:02 -07:00
committed by GitHub
parent ce5760d46c
commit edb3eb5b2e
4 changed files with 91 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -13,7 +13,6 @@ using SS14.Shared.Interfaces.GameObjects;
using SS14.Shared.Interfaces.GameObjects.Components;
using SS14.Shared.Interfaces.Network;
using SS14.Shared.IoC;
using SS14.Shared.Players;
using SS14.Shared.Serialization;
namespace Content.Server.GameObjects
@@ -43,10 +42,6 @@ namespace Content.Server.GameObjects
// Mostly arbitrary.
public const float PICKUP_RANGE = 2;
private InputCmdHandler _swapHandsCmdHandler;
private InputCmdHandler _dropCmdHandler;
private InputCmdHandler _activateItemInHandCmdHandler;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
@@ -251,7 +246,7 @@ namespace Content.Server.GameObjects
return new HandsComponentState(dict, ActiveIndex);
}
private void SwapHands(ICommonSession channel)
public void SwapHands()
{
var index = orderedHands.FindIndex(x => x == ActiveIndex);
index++;
@@ -263,6 +258,15 @@ namespace Content.Server.GameObjects
ActiveIndex = orderedHands[index];
}
public void ActivateItem()
{
var used = GetActiveHand?.Owner;
if (used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
}
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
{
base.HandleMessage(message, netChannel, component);
@@ -294,42 +298,7 @@ namespace Content.Server.GameObjects
}
break;
}
//Boundkeychangedmsg only works for the player entity and doesn't need any extra verification
case PlayerAttachedMsg msg:
InitInputCommands();
input = msg.NewPlayer.Input;
input.SetCommand(ContentKeyFunctions.SwapHands, _swapHandsCmdHandler);
input.SetCommand(ContentKeyFunctions.Drop, _dropCmdHandler);
input.SetCommand(ContentKeyFunctions.ActivateItemInHand, _activateItemInHandCmdHandler);
break;
case PlayerDetachedMsg msg:
input = msg.OldPlayer.Input;
input.SetCommand(ContentKeyFunctions.SwapHands, null);
input.SetCommand(ContentKeyFunctions.Drop, null);
input.SetCommand(ContentKeyFunctions.ActivateItemInHand, null);
break;
}
}
private void InitInputCommands()
{
if (_swapHandsCmdHandler != null)
{
return;
}
_swapHandsCmdHandler = InputCmdHandler.FromDelegate(SwapHands);
_dropCmdHandler = InputCmdHandler.FromDelegate(session => Drop(ActiveIndex));
_activateItemInHandCmdHandler = InputCmdHandler.FromDelegate(session =>
{
var used = GetActiveHand?.Owner;
if (used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
}
});
}
}
}