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

SnapGridComponent Removal (#3884)

Browse Source 
* Removed SnapGridOffset, there is only center now.

* SnapGridComponent methods are now static.

* Removed SnapGridComponent.OnPositionChanged.

* Refactored static functions off SnapGridComponent to MapGrid.
Refactored away usages of SnapGridComponent.Position.

* Added Transform.Anchored for checking if an entity is a tile entity.
More refactoring for static MapGrid functions.

* Static snapgrid methods on MapGrid are no longer static.

* Add setter to ITransformComponent.Anchored.
Removed direct references to SnapGridComponent from content.

* Grid functions now deal with EntityUids instead of SnapGridComponents.
Began renaming public API functions from SnapGrid to Anchor.

* Remove the SnapGridComponent 'Offset' field from all yaml files. This was removed in code previously, so the yaml linter was upset.

* Update engine submodule to v0.4.46.
This commit is contained in:
Acruid
2021-04-28 10:49:37 -07:00
committed by GitHub
parent 578b767791
commit 00e01d51fd
74 changed files with 306 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs
View File

@@ -78,7 +78,6 @@ namespace Content.Server.GameObjects.Components.Fluids
private bool _overflown;
private SpriteComponent _spriteComponent = default!;
private SnapGridComponent _snapGrid = default!;
public ReagentUnit MaxVolume
{
@@ -112,7 +111,6 @@ namespace Content.Server.GameObjects.Components.Fluids
base.Initialize();
_contents = Owner.EnsureComponentWarn<SolutionContainerComponent>();
_snapGrid = Owner.EnsureComponent<SnapGridComponent>();
// Smaller than 1m^3 for now but realistically this shouldn't be hit
MaxVolume = ReagentUnit.New(1000);
@@ -348,8 +346,9 @@ namespace Content.Server.GameObjects.Components.Fluids
puddle = default;
var mapGrid = _mapManager.GetGrid(Owner.Transform.GridID);
var coords = Owner.Transform.Coordinates;
if (!Owner.Transform.Coordinates.Offset(direction).TryGetTileRef(out var tile))
if (!coords.Offset(direction).TryGetTileRef(out var tile))
{
return false;
}
@@ -360,16 +359,19 @@ namespace Content.Server.GameObjects.Components.Fluids
return false;
}
foreach (var entity in _snapGrid.GetInDir(direction))
if (!Owner.Transform.Anchored)
return false;
foreach (var entity in mapGrid.GetInDir(coords, direction))
{
if (entity.TryGetComponent(out IPhysBody? physics) &&
if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out IPhysBody? physics) &&
(physics.CollisionLayer & (int) CollisionGroup.Impassable) != 0)
{
puddle = default;
return false;
}
if (entity.TryGetComponent(out PuddleComponent? existingPuddle))
if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out PuddleComponent? existingPuddle))
{
if (existingPuddle._overflown)
{
@@ -382,8 +384,7 @@ namespace Content.Server.GameObjects.Components.Fluids
if (puddle == default)
{
var grid = _snapGrid.DirectionToGrid(direction);
puddle = () => Owner.EntityManager.SpawnEntity(Owner.Prototype?.ID, grid).GetComponent<PuddleComponent>();
puddle = () => Owner.EntityManager.SpawnEntity(Owner.Prototype?.ID, mapGrid.DirectionToGrid(coords, direction)).GetComponent<PuddleComponent>();
}
return true;