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

Refactor slip dropping to use throwing (#5476)

Browse Source 
* Refactor slip dropping to use throwing

* Update Content.Server/Fluids/EntitySystems/SpillableSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Uncringe

* Update Content.Server/Fluids/EntitySystems/SpillableSystem.cs

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
This commit is contained in:
Clyybber
2021-11-24 00:38:39 +01:00
committed by GitHub
parent ee27c75224
commit 0e98c1c524
10 changed files with 113 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Fluids/Components/SpillableComponent.cs
View File

@@ -3,25 +3,13 @@ using Content.Shared.Interaction;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Fluids.Components namespace Content.Server.Fluids.Components;
[RegisterComponent]
public class SpillableComponent : Component
{ {
[RegisterComponent] public override string Name => "Spillable";
public class SpillableComponent : Component, IDropped
{
public override string Name => "Spillable";
[DataField("solution")] [DataField("solution")]
public string SolutionName = "puddle"; public string SolutionName = "puddle";
void IDropped.Dropped(DroppedEventArgs eventArgs)
{
if (!eventArgs.Intentional
&& EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner.Uid, SolutionName, out var solutionComponent))
{
EntitySystem.Get<SolutionContainerSystem>()
.Drain(Owner.Uid, solutionComponent, solutionComponent.DrainAvailable)
.SpillAt(Owner.Transform.Coordinates, "PuddleSmear");
}
}
}
} }

33
Content.Server/Fluids/EntitySystems/SpillableSystem.cs Normal file
View File

@@ -0,0 +1,33 @@
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Construction.Components;
using Content.Server.Fluids.Components;
using Content.Shared.Examine;
using Content.Shared.Throwing;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Fluids.EntitySystems;
[UsedImplicitly]
public class SpillableSystem : EntitySystem
{
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
}
void SpillOnLand(EntityUid uid, SpillableComponent component, LandEvent args) {
if (args.User != null && _solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var solutionComponent))
{
_solutionContainerSystem
.Drain(uid, solutionComponent, solutionComponent.DrainAvailable)
.SpillAt(EntityManager.GetComponent<TransformComponent>(uid).Coordinates, "PuddleSmear");
}
}
}

12
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -166,18 +166,6 @@ namespace Content.Server.Hands.Systems
hands.ActivateHeldEntity(msg.HandName); hands.ActivateHeldEntity(msg.HandName);
} }
protected override void DropAllItemsInHands(IEntity entity, bool doMobChecks = true)
{
base.DropAllItemsInHands(entity, doMobChecks);
if (!entity.TryGetComponent(out HandsComponent? hands)) return;
foreach (var heldItem in hands.GetAllHeldItems())
{
hands.Drop(heldItem.Owner, doMobChecks, false);
}
}
//TODO: Actually shows all items/clothing/etc. //TODO: Actually shows all items/clothing/etc.
private void HandleExamined(EntityUid uid, HandsComponent component, ExaminedEvent args) private void HandleExamined(EntityUid uid, HandsComponent component, ExaminedEvent args)
{ {

41
Content.Server/Standing/StandingStateSystem.cs Normal file
View File

@@ -0,0 +1,41 @@
using Content.Server.Hands.Components;
using Content.Shared.Standing;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Random;
namespace Content.Server.Standing;
public class StandingStateSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
private void FallOver(EntityUid uid, StandingStateComponent component, DropHandItemsEvent args)
{
var direction = EntityManager.TryGetComponent(uid, out PhysicsComponent? comp) ? comp.LinearVelocity / 50 : Vector2.Zero;
var dropAngle = _random.NextFloat(0.8f, 1.2f);
if (EntityManager.TryGetComponent(uid, out HandsComponent? hands))
{
foreach (var heldItem in hands.GetAllHeldItems())
{
if (hands.Drop(heldItem.Owner))
{
Throwing.ThrowHelper.TryThrow(heldItem.Owner,
_random.NextAngle().RotateVec(direction / dropAngle +
EntityManager.GetEntity(uid).Transform.WorldRotation.ToVec() / 50),
0.5f * dropAngle * _random.NextFloat(-0.9f, 1.1f),
EntityManager.GetEntity(uid), 0);
}
}
}
}
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<StandingStateComponent, DropHandItemsEvent>(FallOver);
}
}

4
Content.Server/Throwing/ThrowHelper.cs
View File

@@ -33,7 +33,6 @@ namespace Content.Server.Throwing
internal static void TryThrow(this IEntity entity, Vector2 direction, float strength = 1.0f, IEntity? user = null, float pushbackRatio = 1.0f) internal static void TryThrow(this IEntity entity, Vector2 direction, float strength = 1.0f, IEntity? user = null, float pushbackRatio = 1.0f)
{ {
if (entity.Deleted || if (entity.Deleted ||
direction == Vector2.Zero ||
strength <= 0f || strength <= 0f ||
!entity.TryGetComponent(out PhysicsComponent? physicsComponent)) !entity.TryGetComponent(out PhysicsComponent? physicsComponent))
{ {
@@ -61,7 +60,7 @@ namespace Content.Server.Throwing
{ {
physicsComponent.ApplyAngularImpulse(ThrowAngularImpulse); physicsComponent.ApplyAngularImpulse(ThrowAngularImpulse);
} }
else else if(direction != Vector2.Zero)
{ {
entity.Transform.LocalRotation = direction.ToWorldAngle() - Math.PI; entity.Transform.LocalRotation = direction.ToWorldAngle() - Math.PI;
} }
@@ -79,6 +78,7 @@ namespace Content.Server.Throwing
if (time < FlyTime) if (time < FlyTime)
{ {
physicsComponent.BodyStatus = BodyStatus.OnGround; physicsComponent.BodyStatus = BodyStatus.OnGround;
EntitySystem.Get<ThrownItemSystem>().LandComponent(comp);
} }
else else
{ {

34
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -146,7 +146,7 @@ namespace Content.Shared.Hands.Components
private void RemoveHand(Hand hand) private void RemoveHand(Hand hand)
{ {
DropHeldEntityToFloor(hand, intentionalDrop: false); DropHeldEntityToFloor(hand);
hand.Container?.Shutdown(); hand.Container?.Shutdown();
Hands.Remove(hand); Hands.Remove(hand);
@@ -306,34 +306,34 @@ namespace Content.Shared.Hands.Components
/// <summary> /// <summary>
/// Tries to drop the contents of the active hand to the target location. /// Tries to drop the contents of the active hand to the target location.
/// </summary> /// </summary>
public bool TryDropActiveHand(EntityCoordinates targetDropLocation, bool doMobChecks = true, bool intentional = true) public bool TryDropActiveHand(EntityCoordinates targetDropLocation, bool doMobChecks = true)
{ {
if (!TryGetActiveHand(out var hand)) if (!TryGetActiveHand(out var hand))
return false; return false;
return TryDropHeldEntity(hand, targetDropLocation, doMobChecks, intentional); return TryDropHeldEntity(hand, targetDropLocation, doMobChecks);
} }
/// <summary> /// <summary>
/// Tries to drop the contents of a hand to the target location. /// Tries to drop the contents of a hand to the target location.
/// </summary> /// </summary>
public bool TryDropHand(string handName, EntityCoordinates targetDropLocation, bool checkActionBlocker = true, bool intentional = true) public bool TryDropHand(string handName, EntityCoordinates targetDropLocation, bool checkActionBlocker = true)
{ {
if (!TryGetHand(handName, out var hand)) if (!TryGetHand(handName, out var hand))
return false; return false;
return TryDropHeldEntity(hand, targetDropLocation, checkActionBlocker, intentional); return TryDropHeldEntity(hand, targetDropLocation, checkActionBlocker);
} }
/// <summary> /// <summary>
/// Tries to drop a held entity to the target location. /// Tries to drop a held entity to the target location.
/// </summary> /// </summary>
public bool TryDropEntity(IEntity entity, EntityCoordinates coords, bool doMobChecks = true, bool intentional = true) public bool TryDropEntity(IEntity entity, EntityCoordinates coords, bool doMobChecks = true)
{ {
if (!TryGetHandHoldingEntity(entity, out var hand)) if (!TryGetHandHoldingEntity(entity, out var hand))
return false; return false;
return TryDropHeldEntity(hand, coords, doMobChecks, intentional); return TryDropHeldEntity(hand, coords, doMobChecks);
} }
/// <summary> /// <summary>
@@ -369,23 +369,23 @@ namespace Content.Shared.Hands.Components
/// <summary> /// <summary>
/// Tries to drop the contents of a hand directly under the player. /// Tries to drop the contents of a hand directly under the player.
/// </summary> /// </summary>
public bool Drop(string handName, bool checkActionBlocker = true, bool intentionalDrop = true) public bool Drop(string handName, bool checkActionBlocker = true)
{ {
if (!TryGetHand(handName, out var hand)) if (!TryGetHand(handName, out var hand))
return false; return false;
return TryDropHeldEntity(hand, Owner.Transform.Coordinates, checkActionBlocker, intentionalDrop); return TryDropHeldEntity(hand, Owner.Transform.Coordinates, checkActionBlocker);
} }
/// <summary> /// <summary>
/// Tries to drop a held entity directly under the player. /// Tries to drop a held entity directly under the player.
/// </summary> /// </summary>
public bool Drop(IEntity entity, bool checkActionBlocker = true, bool intentionalDrop = true) public bool Drop(IEntity entity, bool checkActionBlocker = true)
{ {
if (!TryGetHandHoldingEntity(entity, out var hand)) if (!TryGetHandHoldingEntity(entity, out var hand))
return false; return false;
return TryDropHeldEntity(hand, Owner.Transform.Coordinates, checkActionBlocker, intentionalDrop); return TryDropHeldEntity(hand, Owner.Transform.Coordinates, checkActionBlocker);
} }
/// <summary> /// <summary>
@@ -467,7 +467,7 @@ namespace Content.Shared.Hands.Components
/// <summary> /// <summary>
/// Drops a hands contents to the target location. /// Drops a hands contents to the target location.
/// </summary> /// </summary>
public void DropHeldEntity(Hand hand, EntityCoordinates targetDropLocation, bool intentionalDrop = true) public void DropHeldEntity(Hand hand, EntityCoordinates targetDropLocation)
{ {
var heldEntity = hand.HeldEntity; var heldEntity = hand.HeldEntity;
@@ -476,7 +476,7 @@ namespace Content.Shared.Hands.Components
RemoveHeldEntityFromHand(hand); RemoveHeldEntityFromHand(hand);
EntitySystem.Get<SharedInteractionSystem>().DroppedInteraction(Owner, heldEntity, intentionalDrop); EntitySystem.Get<SharedInteractionSystem>().DroppedInteraction(Owner, heldEntity);
heldEntity.Transform.WorldPosition = GetFinalDropCoordinates(targetDropLocation); heldEntity.Transform.WorldPosition = GetFinalDropCoordinates(targetDropLocation);
@@ -510,7 +510,7 @@ namespace Content.Shared.Hands.Components
/// <summary> /// <summary>
/// Tries to drop a hands contents to the target location. /// Tries to drop a hands contents to the target location.
/// </summary> /// </summary>
private bool TryDropHeldEntity(Hand hand, EntityCoordinates location, bool checkActionBlocker, bool intentionalDrop = true) private bool TryDropHeldEntity(Hand hand, EntityCoordinates location, bool checkActionBlocker)
{ {
if (!CanRemoveHeldEntityFromHand(hand)) if (!CanRemoveHeldEntityFromHand(hand))
return false; return false;
@@ -518,16 +518,16 @@ namespace Content.Shared.Hands.Components
if (checkActionBlocker && !PlayerCanDrop()) if (checkActionBlocker && !PlayerCanDrop())
return false; return false;
DropHeldEntity(hand, location, intentionalDrop); DropHeldEntity(hand, location);
return true; return true;
} }
/// <summary> /// <summary>
/// Drops the contents of a hand directly under the player. /// Drops the contents of a hand directly under the player.
/// </summary> /// </summary>
private void DropHeldEntityToFloor(Hand hand, bool intentionalDrop = true) private void DropHeldEntityToFloor(Hand hand)
{ {
DropHeldEntity(hand, Owner.Transform.Coordinates, intentionalDrop); DropHeldEntity(hand, Owner.Transform.Coordinates);
} }
private bool CanPutHeldEntityIntoContainer(Hand hand, IContainer targetContainer, bool checkActionBlocker) private bool CanPutHeldEntityIntoContainer(Hand hand, IContainer targetContainer, bool checkActionBlocker)

53
Content.Shared/Hands/SharedHandsSystem.cs
View File

@@ -18,47 +18,6 @@ namespace Content.Shared.Hands
SubscribeAllEvent<RequestSetHandEvent>(HandleSetHand); SubscribeAllEvent<RequestSetHandEvent>(HandleSetHand);
} }
public void DropHandItems(IEntity entity, bool doMobChecks = true)
{
DropHandItems(entity.Uid, doMobChecks);
}
public void DropHandItems(EntityUid uid, bool doMobChecks = true, SharedHandsComponent? hands = null)
{
if (!Resolve(uid, ref hands))
return;
DropHandItems(hands, doMobChecks);
}
private void DropHandItems(SharedHandsComponent handsComponent, bool doMobChecks = true)
{
var msg = new DropHandItemsAttemptEvent();
var entity = handsComponent.Owner;
var uid = entity.Uid;
var eventBus = EntityManager.EventBus;
eventBus.RaiseLocalEvent(uid, msg);
if (msg.Cancelled)
return;
if (entity.TryGetContainerMan(out var containerManager))
{
var parentMsg = new ContainedEntityDropHandItemsAttemptEvent(uid);
eventBus.RaiseLocalEvent(containerManager.OwnerUid, parentMsg);
if (parentMsg.Cancelled)
return;
}
DropAllItemsInHands(entity, doMobChecks);
}
protected virtual void DropAllItemsInHands(IEntity entity, bool doMobChecks = true)
{
}
private static void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs) private static void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs)
{ {
var entity = eventArgs.SenderSession.AttachedEntity; var entity = eventArgs.SenderSession.AttachedEntity;
@@ -78,18 +37,6 @@ namespace Content.Shared.Hands
} }
} }
public sealed class ContainedEntityDropHandItemsAttemptEvent : CancellableEntityEventArgs
{
public EntityUid EntityUid { get; }
public ContainedEntityDropHandItemsAttemptEvent(EntityUid uid)
{
EntityUid = uid;
}
}
public sealed class DropHandItemsAttemptEvent : CancellableEntityEventArgs {}
[Serializable, NetSerializable] [Serializable, NetSerializable]
public class RequestSetHandEvent : EntityEventArgs public class RequestSetHandEvent : EntityEventArgs
{ {

13
Content.Shared/Interaction/IDropped.cs
View File

@@ -17,15 +17,12 @@ namespace Content.Shared.Interaction
public class DroppedEventArgs : EventArgs public class DroppedEventArgs : EventArgs
{ {
public DroppedEventArgs(IEntity user, bool intentional) public DroppedEventArgs(IEntity user)
{ {
User = user; User = user;
Intentional = intentional;
} }
public IEntity User { get; } public IEntity User { get; }
public bool Intentional { get; }
} }
/// <summary> /// <summary>
@@ -44,16 +41,10 @@ namespace Content.Shared.Interaction
/// </summary> /// </summary>
public EntityUid DroppedUid { get; } public EntityUid DroppedUid { get; }
/// <summary> public DroppedEvent(EntityUid user, EntityUid dropped)
/// If the item was dropped intentionally.
/// </summary>
public bool Intentional { get; }
public DroppedEvent(EntityUid user, EntityUid dropped, bool intentional)
{ {
UserUid = user; UserUid = user;
DroppedUid = dropped; DroppedUid = dropped;
Intentional = intentional;
} }
} }
} }

12
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -658,11 +658,11 @@ namespace Content.Shared.Interaction
/// Activates the Dropped behavior of an object /// Activates the Dropped behavior of an object
/// Verifies that the user is capable of doing the drop interaction first /// Verifies that the user is capable of doing the drop interaction first
/// </summary> /// </summary>
public bool TryDroppedInteraction(IEntity user, IEntity item, bool intentional) public bool TryDroppedInteraction(IEntity user, IEntity item)
{ {
if (user == null || item == null || !_actionBlockerSystem.CanDrop(user.Uid)) return false; if (user == null || item == null || !_actionBlockerSystem.CanDrop(user.Uid)) return false;
DroppedInteraction(user, item, intentional); DroppedInteraction(user, item);
return true; return true;
} }
@@ -670,21 +670,21 @@ namespace Content.Shared.Interaction
/// Calls Dropped on all components that implement the IDropped interface /// Calls Dropped on all components that implement the IDropped interface
/// on an entity that has been dropped. /// on an entity that has been dropped.
/// </summary> /// </summary>
public void DroppedInteraction(IEntity user, IEntity item, bool intentional) public void DroppedInteraction(IEntity user, IEntity item)
{ {
var dropMsg = new DroppedEvent(user.Uid, item.Uid, intentional); var dropMsg = new DroppedEvent(user.Uid, item.Uid);
RaiseLocalEvent(item.Uid, dropMsg); RaiseLocalEvent(item.Uid, dropMsg);
if (dropMsg.Handled) if (dropMsg.Handled)
return; return;
item.Transform.LocalRotation = intentional ? Angle.Zero : (_random.Next(0, 100) / 100f) * MathHelper.TwoPi; item.Transform.LocalRotation = Angle.Zero;
var comps = item.GetAllComponents<IDropped>().ToList(); var comps = item.GetAllComponents<IDropped>().ToList();
// Call Land on all components that implement the interface // Call Land on all components that implement the interface
foreach (var comp in comps) foreach (var comp in comps)
{ {
comp.Dropped(new DroppedEventArgs(user, intentional)); comp.Dropped(new DroppedEventArgs(user));
} }
} }
#endregion #endregion

6
Content.Shared/Standing/StandingStateSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Shared.Standing
// and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent. // and ultimately this is just to avoid boilerplate in Down callers + keep their behavior consistent.
if (dropHeldItems && hands != null) if (dropHeldItems && hands != null)
{ {
_sharedHandsSystem.DropHandItems(uid, false, hands); RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
} }
var msg = new DownAttemptEvent(); var msg = new DownAttemptEvent();
@@ -97,6 +97,10 @@ namespace Content.Shared.Standing
} }
} }
public sealed class DropHandItemsEvent : EventArgs
{
}
/// <summary> /// <summary>
/// Subscribe if you can potentially block a down attempt. /// Subscribe if you can potentially block a down attempt.
/// </summary> /// </summary>