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

Input Refactor (#72)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-05-27 10:13:33 +02:00
committed by GitHub
parent b13d100107
commit f1ec10e3e1
7 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects;
using Content.Shared.Input;
using SS14.Server.GameObjects;
using SS14.Server.GameObjects.Components.Container;
using SS14.Server.Interfaces.Player;
@@ -40,6 +41,10 @@ namespace Content.Server.GameObjects
// Mostly arbitrary.
public const float PICKUP_RANGE = 2;
private InputCommand SwapHandsCommand;
private InputCommand DropCommand;
private InputCommand ActivateItemInHandCommand;
public override void ExposeData(EntitySerializer serializer)
{
base.ExposeData(serializer);
@@ -256,6 +261,7 @@ namespace Content.Server.GameObjects
{
base.HandleMessage(message, netChannel, component);
IPlayerInput input;
switch (message)
{
case ClientChangedHandMsg msg:
@@ -284,27 +290,40 @@ namespace Content.Server.GameObjects
}
//Boundkeychangedmsg only works for the player entity and doesn't need any extra verification
case BoundKeyChangedMsg msg:
if (msg.State != BoundKeyState.Down)
return;
switch (msg.Function)
{
case BoundKeyFunctions.SwitchHands:
SwapHands();
break;
case BoundKeyFunctions.Drop:
Drop(ActiveIndex);
break;
case BoundKeyFunctions.ActivateItemInHand:
var used = GetActiveHand?.Owner;
if (used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
}
break;
}
case PlayerAttachedMsg msg:
InitInputCommands();
input = msg.NewPlayer.Input;
input.SetCommand(ContentKeyFunctions.SwapHands, SwapHandsCommand);
input.SetCommand(ContentKeyFunctions.Drop, DropCommand);
input.SetCommand(ContentKeyFunctions.ActivateItemInHand, ActivateItemInHandCommand);
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 (SwapHandsCommand != null)
{
return;
}
SwapHandsCommand = InputCommand.FromDelegate(SwapHands);
DropCommand = InputCommand.FromDelegate(() => Drop(ActiveIndex));
ActivateItemInHandCommand = InputCommand.FromDelegate(() =>
{
var used = GetActiveHand?.Owner;
if (used != null)
{
InteractionSystem.TryUseInteraction(Owner, used);
}
});
}
}
}