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

Update content vectors to numerics (#17759)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-08 14:08:32 +10:00
committed by GitHub
parent 15772478c9
commit 68480af109
383 changed files with 978 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
View File

@@ -1,3 +1,4 @@
using System.Numerics;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
using Robust.Shared.Containers;
@@ -134,18 +135,18 @@ public abstract partial class SharedHandsSystem : EntitySystem
private Vector2 GetFinalDropCoordinates(EntityUid user, MapCoordinates origin, MapCoordinates target)
{
var dropVector = target.Position - origin.Position;
var requestedDropDistance = dropVector.Length;
var requestedDropDistance = dropVector.Length();
if (dropVector.Length > SharedInteractionSystem.InteractionRange)
if (dropVector.Length() > SharedInteractionSystem.InteractionRange)
{
dropVector = dropVector.Normalized * SharedInteractionSystem.InteractionRange;
dropVector = dropVector.Normalized() * SharedInteractionSystem.InteractionRange;
target = new MapCoordinates(origin.Position + dropVector, target.MapId);
}
var dropLength = _interactionSystem.UnobstructedDistance(origin, target, predicate: e => e == user);
if (dropLength < requestedDropDistance)
return origin.Position + dropVector.Normalized * dropLength;
return origin.Position + dropVector.Normalized() * dropLength;
return target.Position;
}

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

@@ -1,3 +1,4 @@
using System.Numerics;
using Content.Shared.Database;
using Content.Shared.Hands.Components;
using Content.Shared.Item;
@@ -111,7 +112,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
var itemPos = Transform(entity).MapPosition;
if (itemPos.MapId == xform.MapID
&& (itemPos.Position - xform.MapPosition.Position).Length <= MaxAnimationRange
&& (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);