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

16
Content.Server/AI/Utils/Visibility.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.AI.Utils
if (owner.TryGetComponent(out AiControllerComponent controller))
{
var targetRange = (target.Transform.GridPosition.Position - owner.Transform.GridPosition.Position).Length;
var targetRange = (target.Transform.Coordinates.Position - owner.Transform.Coordinates.Position).Length;
if (targetRange > controller.VisionRadius)
{
return false;
@@ -35,9 +35,9 @@ namespace Content.Server.AI.Utils
range = controller.VisionRadius;
}
var angle = new Angle(target.Transform.GridPosition.Position - owner.Transform.GridPosition.Position);
var angle = new Angle(target.Transform.Coordinates.Position - owner.Transform.Coordinates.Position);
var ray = new CollisionRay(
owner.Transform.GridPosition.Position,
owner.Transform.Coordinates.Position,
angle.ToVec(),
(int)(CollisionGroup.Opaque | CollisionGroup.Impassable | CollisionGroup.MobImpassable));
@@ -47,25 +47,25 @@ namespace Content.Server.AI.Utils
}
// Should this be in robust or something? Fark it
public static IEnumerable<IEntity> GetNearestEntities(GridCoordinates grid, Type component, float range)
public static IEnumerable<IEntity> GetNearestEntities(EntityCoordinates grid, Type component, float range)
{
var inRange = GetEntitiesInRange(grid, component, range).ToList();
var sortedInRange = inRange.OrderBy(o => (o.Transform.GridPosition.Position - grid.Position).Length);
var sortedInRange = inRange.OrderBy(o => (o.Transform.Coordinates.Position - grid.Position).Length);
return sortedInRange;
}
public static IEnumerable<IEntity> GetEntitiesInRange(GridCoordinates grid, Type component, float range)
public static IEnumerable<IEntity> GetEntitiesInRange(EntityCoordinates grid, Type component, float range)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
foreach (var entity in entityManager.GetEntities(new TypeEntityQuery(component)))
{
if (entity.Transform.GridPosition.GridID != grid.GridID)
if (entity.Transform.Coordinates.GetGridId(entityManager) != grid.GetGridId(entityManager))
{
continue;
}
if ((entity.Transform.GridPosition.Position - grid.Position).Length <= range)
if ((entity.Transform.Coordinates.Position - grid.Position).Length <= range)
{
yield return entity;
}