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

Replace every usage of GridCoordinates with EntityCoordinates (#2021)

Browse Source 
* Update RobustToolbox

* Transition direct type usages

* More updates

* Fix invalid use of to map

* Update RobustToolbox

* Fix dropping items

* Rename name usages of "GridCoordinates" to "EntityCoordinates"

* Revert "Update RobustToolbox"

This reverts commit 9f334a17c5908ded0043a63158bb671e4aa3f346.

* Revert "Update RobustToolbox"

This reverts commit 3a9c8cfa3606fa501aa84407796d2ad920853a09.

# Conflicts:
#	RobustToolbox

* Fix cursed IMapGrid method usage.

* GridTileLookupTest now uses EntityCoordinates

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: Víctor Aguilera Puerto <zddm@outlook.es>
This commit is contained in:
DrSmugleaf
2020-09-06 16:11:53 +02:00
committed by GitHub
parent 72d2318ea7
commit 48b61f6bcc
196 changed files with 780 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameObjects/Components/GUI/HandsComponent.cs
View File

@@ -181,7 +181,7 @@ namespace Content.Server.GameObjects.Components.GUI
{
if (!PutInHand(item, mobCheck))
{
item.Owner.Transform.GridPosition = Owner.Transform.GridPosition;
item.Owner.Transform.Coordinates = Owner.Transform.Coordinates;
}
}
@@ -245,7 +245,7 @@ namespace Content.Server.GameObjects.Components.GUI
return false;
}
public bool Drop(string slot, GridCoordinates coords, bool doMobChecks = true)
public bool Drop(string slot, EntityCoordinates coords, bool doMobChecks = true)
{
var hand = GetHand(slot);
if (!CanDrop(slot) || hand?.Entity == null)
@@ -264,7 +264,7 @@ namespace Content.Server.GameObjects.Components.GUI
return false;
item.RemovedFromSlot();
item.Owner.Transform.GridPosition = coords;
item.Owner.Transform.Coordinates = coords;
if (ContainerHelpers.TryGetContainer(Owner, out var container))
{
@@ -277,7 +277,7 @@ namespace Content.Server.GameObjects.Components.GUI
return true;
}
public bool Drop(IEntity entity, GridCoordinates coords, bool doMobChecks = true)
public bool Drop(IEntity entity, EntityCoordinates coords, bool doMobChecks = true)
{
if (entity == null)
{
@@ -311,7 +311,7 @@ namespace Content.Server.GameObjects.Components.GUI
}
item.RemovedFromSlot();
item.Owner.Transform.GridPosition = Owner.Transform.GridPosition;
item.Owner.Transform.Coordinates = Owner.Transform.Coordinates;
if (item.Owner.TryGetComponent<SpriteComponent>(out var spriteComponent))
{
@@ -564,7 +564,7 @@ namespace Content.Server.GameObjects.Components.GUI
controller.StartPull(Owner.GetComponent<ICollidableComponent>());
}
public void MovePulledObject(GridCoordinates puller, GridCoordinates to)
public void MovePulledObject(EntityCoordinates puller, EntityCoordinates to)
{
if (PulledObject != null &&
PulledObject.TryGetController(out PullController controller))
@@ -655,7 +655,7 @@ namespace Content.Server.GameObjects.Components.GUI
if (used != null)
{
interactionSystem.Interaction(Owner, used, hand.Entity,
GridCoordinates.InvalidGrid);
EntityCoordinates.Invalid);
}
else
{