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

Trashbag stuff (#18096)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-18 21:44:00 +10:00
committed by GitHub
parent e0291500af
commit fcf01cc6ef
13 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
View File

@@ -109,14 +109,15 @@ public abstract partial class SharedHandsSystem : EntitySystem
{
var xform = Transform(uid);
var coordinateEntity = xform.ParentUid.IsValid() ? xform.ParentUid : uid;
var itemPos = Transform(entity).MapPosition;
var itemXform = Transform(entity);
var itemPos = itemXform.MapPosition;
if (itemPos.MapId == xform.MapID
&& (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange
&& MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
{
var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager);
PickupAnimation(entity, initialPosition, xform.LocalPosition, animateUser ? null : uid);
PickupAnimation(entity, initialPosition, xform.LocalPosition, itemXform.LocalRotation, animateUser ? null : uid);
}
}
DoPickup(uid, hand, entity, handsComp);
@@ -232,6 +233,6 @@ public abstract partial class SharedHandsSystem : EntitySystem
RaiseLocalEvent(entity, new HandSelectedEvent(uid), false);
}
public abstract void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition,
public abstract void PickupAnimation(EntityUid item, EntityCoordinates initialPosition, Vector2 finalPosition, Angle initialAngle,
EntityUid? exclude);
}

4
Content.Shared/Hands/HandEvents.cs
View File

@@ -120,13 +120,15 @@ namespace Content.Shared.Hands
public EntityUid ItemUid { get; }
public EntityCoordinates InitialPosition { get; }
public Vector2 FinalPosition { get; }
public Angle InitialAngle { get; }
public PickupAnimationEvent(EntityUid itemUid, EntityCoordinates initialPosition,
Vector2 finalPosition)
Vector2 finalPosition, Angle initialAngle)
{
ItemUid = itemUid;
FinalPosition = finalPosition;
InitialPosition = initialPosition;
InitialAngle = initialAngle;
}
}