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

Remove hardcoded ghosting from MoverSystem.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-04-18 12:10:50 +02:00
parent 8076ecfc2e
commit 028ca7a732
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -3,9 +3,12 @@ using System.Collections.Generic;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects.Components.Movement;
using Content.Server.Observer;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Interfaces.Player;
using Robust.Shared.ContentPack; using Robust.Shared.ContentPack;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -15,7 +18,7 @@ using Robust.Shared.Serialization;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {
[RegisterComponent] [RegisterComponent]
public class SpeciesComponent : SharedSpeciesComponent, IActionBlocker, IOnDamageBehavior, IExAct public class SpeciesComponent : SharedSpeciesComponent, IActionBlocker, IOnDamageBehavior, IExAct, IRelayMoveInput
{ {
/// <summary> /// <summary>
/// Damagestates are reached by reaching a certain damage threshold, they will block actions after being reached /// Damagestates are reached by reaching a certain damage threshold, they will block actions after being reached
@@ -198,6 +201,14 @@ namespace Content.Server.GameObjects
Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Brute, bruteDamage, null); Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Brute, bruteDamage, null);
Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Heat, burnDamage, null); Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Heat, burnDamage, null);
} }
void IRelayMoveInput.MoveInputPressed(IPlayerSession session)
{
if (CurrentDamageState is DeadState)
{
new Ghost().Execute(null, session, null);
}
}
} }
/// <summary> /// <summary>

14
Content.Server/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -186,13 +186,19 @@ namespace Content.Server.GameObjects.EntitySystems
private static void HandleDirChange(ICommonSession session, Direction dir, bool state) private static void HandleDirChange(ICommonSession session, Direction dir, bool state)
{ {
if (!TryGetAttachedComponent(session as IPlayerSession, out IMoverComponent moverComp)) var playerSes = session as IPlayerSession;
if (!TryGetAttachedComponent(playerSes, out IMoverComponent moverComp))
return; return;
var owner = (session as IPlayerSession)?.AttachedEntity; var owner = playerSes?.AttachedEntity;
if (owner != null && owner.TryGetComponent(out SpeciesComponent species) && species.CurrentDamageState is DeadState) if (owner != null)
new Ghost().Execute(null, (IPlayerSession)session, null); {
foreach (var comp in owner.GetAllComponents<IRelayMoveInput>())
{
comp.MoveInputPressed(playerSes);
}
}
moverComp.SetVelocityDirection(dir, state); moverComp.SetVelocityDirection(dir, state);
} }

9
Content.Server/Interfaces/GameObjects/Components/Movement/IRelayMoveInput.cs Normal file
View File

@@ -0,0 +1,9 @@
using Robust.Server.Interfaces.Player;
namespace Content.Server.Interfaces.GameObjects.Components.Movement
{
public interface IRelayMoveInput
{
void MoveInputPressed(IPlayerSession session);
}
}