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

28
Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
View File

@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Interaction
IEntity other = null;
IContainer container = null;
IComponent component = null;
GridCoordinates gridCoordinates = default;
EntityCoordinates entityCoordinates = default;
MapCoordinates mapCoordinates = default;
server.Assert(() =>
@@ -53,7 +53,7 @@ namespace Content.IntegrationTests.Tests.Interaction
other = entityManager.SpawnEntity(HumanId, coordinates);
container = ContainerManagerComponent.Ensure<Container>("InRangeUnobstructedTestOtherContainer", other);
component = other.Transform;
gridCoordinates = other.Transform.GridPosition;
entityCoordinates = other.Transform.Coordinates;
mapCoordinates = other.Transform.MapPosition;
});
@@ -73,9 +73,9 @@ namespace Content.IntegrationTests.Tests.Interaction
Assert.True(origin.InRangeUnobstructed(container));
Assert.True(container.InRangeUnobstructed(origin));
// Entity <-> GridCoordinates
Assert.True(origin.InRangeUnobstructed(gridCoordinates));
Assert.True(gridCoordinates.InRangeUnobstructed(origin));
// Entity <-> EntityCoordinates
Assert.True(origin.InRangeUnobstructed(entityCoordinates));
Assert.True(entityCoordinates.InRangeUnobstructed(origin));
// Entity <-> MapCoordinates
Assert.True(origin.InRangeUnobstructed(mapCoordinates));
@@ -97,9 +97,9 @@ namespace Content.IntegrationTests.Tests.Interaction
Assert.True(origin.InRangeUnobstructed(container));
Assert.True(container.InRangeUnobstructed(origin));
// Entity <-> GridCoordinates
Assert.True(origin.InRangeUnobstructed(gridCoordinates));
Assert.True(gridCoordinates.InRangeUnobstructed(origin));
// Entity <-> EntityCoordinates
Assert.True(origin.InRangeUnobstructed(entityCoordinates));
Assert.True(entityCoordinates.InRangeUnobstructed(origin));
// Entity <-> MapCoordinates
Assert.True(origin.InRangeUnobstructed(mapCoordinates));
@@ -121,9 +121,9 @@ namespace Content.IntegrationTests.Tests.Interaction
Assert.False(origin.InRangeUnobstructed(container));
Assert.False(container.InRangeUnobstructed(origin));
// Entity <-> GridCoordinates
Assert.False(origin.InRangeUnobstructed(gridCoordinates));
Assert.False(gridCoordinates.InRangeUnobstructed(origin));
// Entity <-> EntityCoordinates
Assert.False(origin.InRangeUnobstructed(entityCoordinates));
Assert.False(entityCoordinates.InRangeUnobstructed(origin));
// Entity <-> MapCoordinates
Assert.False(origin.InRangeUnobstructed(mapCoordinates));
@@ -144,9 +144,9 @@ namespace Content.IntegrationTests.Tests.Interaction
Assert.True(origin.InRangeUnobstructed(container, InteractionRangeDivided15Times3));
Assert.True(container.InRangeUnobstructed(origin, InteractionRangeDivided15Times3));
// Entity <-> GridCoordinates
Assert.True(origin.InRangeUnobstructed(gridCoordinates, InteractionRangeDivided15Times3));
Assert.True(gridCoordinates.InRangeUnobstructed(origin, InteractionRangeDivided15Times3));
// Entity <-> EntityCoordinates
Assert.True(origin.InRangeUnobstructed(entityCoordinates, InteractionRangeDivided15Times3));
Assert.True(entityCoordinates.InRangeUnobstructed(origin, InteractionRangeDivided15Times3));
// Entity <-> MapCoordinates
Assert.True(origin.InRangeUnobstructed(mapCoordinates, InteractionRangeDivided15Times3));