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

You can now pickup items inside obstructions (#759)

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-02-28 17:52:18 +01:00
committed by GitHub
parent 2df0f884ba
commit 60d6b4af7d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -87,7 +87,7 @@ namespace Content.Server.GameObjects
var itemPos = Owner.Transform.WorldPosition; var itemPos = Owner.Transform.WorldPosition;
return _entitySystemManager.GetEntitySystem<InteractionSystem>() return _entitySystemManager.GetEntitySystem<InteractionSystem>()
.InRangeUnobstructed(userPos, itemPos, ignoredEnt: Owner); .InRangeUnobstructed(userPos, itemPos, ignoredEnt: Owner, insideBlockerValid:true);
} }
public bool AttackHand(AttackHandEventArgs eventArgs) public bool AttackHand(AttackHandEventArgs eventArgs)

7
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -279,9 +279,10 @@ namespace Content.Server.GameObjects.EntitySystems
/// <param name="collisionMask">the mask to check for collisions</param> /// <param name="collisionMask">the mask to check for collisions</param>
/// <param name="ignoredEnt">the entity to be ignored when checking for collisions.</param> /// <param name="ignoredEnt">the entity to be ignored when checking for collisions.</param>
/// <param name="mapManager">Map manager containing the two GridIds.</param> /// <param name="mapManager">Map manager containing the two GridIds.</param>
/// <param name="insideBlockerValid">if coordinates inside obstructions count as obstructed or not</param>
/// <returns>True if the two points are within a given range without being obstructed.</returns> /// <returns>True if the two points are within a given range without being obstructed.</returns>
public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange, public bool InRangeUnobstructed(MapCoordinates coords, Vector2 otherCoords, float range = InteractionRange,
int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null) int collisionMask = (int) CollisionGroup.Impassable, IEntity ignoredEnt = null, bool insideBlockerValid = false)
{ {
var dir = otherCoords - coords.Position; var dir = otherCoords - coords.Position;
@@ -294,7 +295,9 @@ namespace Content.Server.GameObjects.EntitySystems
var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask); var ray = new CollisionRay(coords.Position, dir.Normalized, collisionMask);
var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt, true); var rayResults = _physicsManager.IntersectRay(coords.MapId, ray, dir.Length, ignoredEnt, true);
return !rayResults.DidHitObject;
return !rayResults.DidHitObject || (insideBlockerValid && rayResults.DidHitObject && rayResults.Distance < 1f);
} }
private bool HandleActivateItemInWorld(ICommonSession session, GridCoordinates coords, EntityUid uid) private bool HandleActivateItemInWorld(ICommonSession session, GridCoordinates coords, EntityUid uid)