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

Interaction rework.

Browse Source 
IActivate is now more used. IAttackHand falls back to IActivate.
This commit is contained in:
Pieter-Jan Briers
2019-05-16 15:51:26 +02:00
parent 1a5c4ad83c
commit c197278c6f
8 changed files with 200 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Construction
var prototype = _prototypeManager.Index<ConstructionPrototype>(prototypeName);
var transform = Owner.Transform;
if (!loc.InRange(_mapManager, transform.GridPosition, InteractionSystem.INTERACTION_RANGE))
if (!loc.InRange(_mapManager, transform.GridPosition, InteractionSystem.InteractionRange))
{
return;
}

5
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -10,7 +10,7 @@ using Robust.Shared.Timers;
namespace Content.Server.GameObjects
{
public class ServerDoorComponent : Component, IAttackHand
public class ServerDoorComponent : Component, IActivate
{
public override string Name => "Door";
@@ -41,7 +41,7 @@ namespace Content.Server.GameObjects
base.OnRemove();
}
public bool AttackHand(AttackHandEventArgs eventArgs)
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (_state == DoorState.Open)
{
@@ -51,7 +51,6 @@ namespace Content.Server.GameObjects
{
Open();
}
return true;
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)

5
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -14,7 +14,7 @@ using Robust.Server.GameObjects;
namespace Content.Server.GameObjects.Components
{
public class EntityStorageComponent : Component, IAttackHand, IStorageComponent
public class EntityStorageComponent : Component, IActivate, IStorageComponent
{
public override string Name => "EntityStorage";
@@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.Components
[ViewVariables]
public bool Open { get; private set; }
public bool AttackHand(AttackHandEventArgs eventArgs)
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (Open)
{
@@ -51,7 +51,6 @@ namespace Content.Server.GameObjects.Components
{
OpenStorage();
}
return true;
}
private void CloseStorage()

7
Content.Server/GameObjects/Components/Power/ApcComponent.cs
View File

@@ -12,7 +12,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameObjects.Components.Power
{
public sealed class ApcComponent : SharedApcComponent, IAttackHand
public sealed class ApcComponent : SharedApcComponent, IActivate
{
PowerStorageComponent Storage;
AppearanceComponent Appearance;
@@ -106,15 +106,14 @@ namespace Content.Server.GameObjects.Components.Power
return net.Lack > 0 ? ApcExternalPowerState.Low : ApcExternalPowerState.Good;
}
bool IAttackHand.AttackHand(AttackHandEventArgs eventArgs)
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent actor))
{
return false;
return;
}
_userInterface.Open(actor.playerSession);
return true;
}
private void _clickSound()

13
Content.Server/GameObjects/Components/Research/LatheComponent.cs
View File

@@ -15,7 +15,7 @@ using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Research
{
public class LatheComponent : SharedLatheComponent, IAttackHand, IAttackBy, IActivate
public class LatheComponent : SharedLatheComponent, IAttackBy, IActivate
{
public const int VolumePerSheet = 3750;
@@ -94,17 +94,6 @@ namespace Content.Server.GameObjects.Components.Research
_userInterface.Open(actor.playerSession);
return;
}
bool IAttackHand.AttackHand(AttackHandEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent actor))
return false;
_userInterface.Open(actor.playerSession);
return true;
}
bool IAttackBy.AttackBy(AttackByEventArgs eventArgs)
{
if (!Owner.TryGetComponent(out MaterialStorageComponent storage)