Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
View File

@@ -151,7 +151,7 @@ namespace Content.Server.GameObjects.Components.Movement
(Vector2 walking, Vector2 sprinting) IMoverComponent.VelocityDir =>
Sprinting ? (Vector2.Zero, VelocityDir) : (VelocityDir, Vector2.Zero);
public GridCoordinates LastPosition { get; set; }
public EntityCoordinates LastPosition { get; set; }
[ViewVariables(VVAccess.ReadWrite)] public float StepSoundDistance { get; set; }

2
Content.Server/GameObjects/Components/Movement/PlayerInputMoverComponent.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.GameObjects.Components.Movement
[ComponentReference(typeof(IMoverComponent))]
public class PlayerInputMoverComponent : SharedPlayerInputMoverComponent
{
public override GridCoordinates LastPosition { get; set; }
public override EntityCoordinates LastPosition { get; set; }
public override float StepSoundDistance { get; set; }
}

8
Content.Server/GameObjects/Components/Movement/ServerPortalComponent.cs
View File

@@ -183,15 +183,15 @@ namespace Content.Server.GameObjects.Components.Movement
return;
}
var position = _connectingTeleporter.Transform.GridPosition;
var position = _connectingTeleporter.Transform.Coordinates;
var soundPlayer = EntitySystem.Get<AudioSystem>();
// Departure
// Do we need to rate-limit sounds to stop ear BLAST?
soundPlayer.PlayAtCoords(_departureSound, entity.Transform.GridPosition);
soundPlayer.PlayAtCoords(_departureSound, entity.Transform.Coordinates);
entity.Transform.AttachToGridOrMap();
entity.Transform.GridPosition = position;
soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.GridPosition);
entity.Transform.Coordinates = position;
soundPlayer.PlayAtCoords(_arrivalSound, entity.Transform.Coordinates);
TryChangeState(PortalState.RecentlyTeleported);
// To stop spam teleporting. Could potentially look at adding a timer to flush this from the portal
ImmuneEntities.Add(entity);

17
Content.Server/GameObjects/Components/Movement/ServerTeleporterComponent.cs
View File

@@ -3,6 +3,7 @@ using System;
using System.Linq;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.GameObjects;
@@ -83,7 +84,7 @@ namespace Content.Server.GameObjects.Components.Movement
{
if (_teleporterType == TeleporterType.Directed)
{
TryDirectedTeleport(eventArgs.User, eventArgs.ClickLocation.ToMap(_mapManager));
TryDirectedTeleport(eventArgs.User, eventArgs.ClickLocation.ToMap(Owner.EntityManager));
}
if (_teleporterType == TeleporterType.Random)
@@ -164,13 +165,13 @@ namespace Content.Server.GameObjects.Components.Movement
private Vector2 RandomEmptySpot(IEntity user, int range)
{
Vector2 targetVector = user.Transform.GridPosition.Position;
Vector2 targetVector = user.Transform.Coordinates.Position;
// Definitely a better way to do this
foreach (var i in Enumerable.Range(0, 5))
{
var randomRange = _spreadRandom.Next(0, range);
var angle = Angle.FromDegrees(_spreadRandom.Next(0, 359));
targetVector = user.Transform.GridPosition.Position + angle.ToVec() * randomRange;
targetVector = user.Transform.Coordinates.Position + angle.ToVec() * randomRange;
if (EmptySpace(user, targetVector))
{
return targetVector;
@@ -201,7 +202,7 @@ namespace Content.Server.GameObjects.Components.Movement
{
var randomRange = _spreadRandom.Next(0, _range);
var angle = Angle.FromDegrees(_spreadRandom.Next(0, 359));
targetVector = user.Transform.GridPosition.Position + angle.ToVec() * randomRange;
targetVector = user.Transform.Coordinates.Position + angle.ToVec() * randomRange;
}
// Start / Continue
if (_state == ItemTeleporterState.Off)
@@ -222,7 +223,7 @@ namespace Content.Server.GameObjects.Components.Movement
public void Teleport(IEntity user, Vector2 vector)
{
// Messy maybe?
var targetGrid = new GridCoordinates(vector, user.Transform.GridID);
var targetGrid = user.ToCoordinates(vector);
var soundPlayer = EntitySystem.Get<AudioSystem>();
// If portals use those, otherwise just move em over
@@ -230,7 +231,7 @@ namespace Content.Server.GameObjects.Components.Movement
{
// Call Delete here as the teleporter should have control over portal longevity
// Departure portal
var departurePortal = _serverEntityManager.SpawnEntity("Portal", user.Transform.GridPosition);
var departurePortal = _serverEntityManager.SpawnEntity("Portal", user.Transform.Coordinates);
departurePortal.TryGetComponent<ServerPortalComponent>(out var departureComponent);
// Arrival portal
@@ -244,12 +245,12 @@ namespace Content.Server.GameObjects.Components.Movement
else
{
// Departure
soundPlayer.PlayAtCoords(_departureSound, user.Transform.GridPosition);
soundPlayer.PlayAtCoords(_departureSound, user.Transform.Coordinates);
// Arrival
user.Transform.AttachToGridOrMap();
user.Transform.WorldPosition = vector;
soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.GridPosition);
soundPlayer.PlayAtCoords(_arrivalSound, user.Transform.Coordinates);
}
}

2
Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
View File

@@ -58,7 +58,7 @@ namespace Content.Server.GameObjects.Components.Movement
public bool Sprinting => false;
public (Vector2 walking, Vector2 sprinting) VelocityDir { get; } = (Vector2.Zero, Vector2.Zero);
public GridCoordinates LastPosition { get; set; }
public EntityCoordinates LastPosition { get; set; }
public float StepSoundDistance { get; set; }
public void SetVelocityDirection(Direction direction, ushort subTick, bool enabled)