Fluid spread refactor (#11908)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Fix undefined
This commit is contained in:
Ygg01
2022-11-15 12:30:59 +01:00
committed by GitHub
parent 89b959f931
commit 75ea093d78
17 changed files with 719 additions and 336 deletions

View File

@@ -1,83 +1,14 @@
using Content.Shared.Maps;
using System.Collections;
using System.Linq;
using Robust.Shared.Map;
using Robust.Shared.Random;
namespace Content.Shared.Directions
namespace Content.Shared.Directions;
public static class SharedDirectionExtensions
{
public static class SharedDirectionExtensions
public static EntityCoordinates Offset(this EntityCoordinates coordinates, Direction direction)
{
/// <summary>
/// Gets random directions until none are left
/// </summary>
/// <returns>An enumerable of the directions.</returns>
public static IEnumerable<Direction> RandomDirections()
{
var directions = new[]
{
Direction.East,
Direction.SouthEast,
Direction.South,
Direction.SouthWest,
Direction.West,
Direction.NorthWest,
Direction.North,
Direction.NorthEast,
};
var robustRandom = IoCManager.Resolve<IRobustRandom>();
var n = directions.Length;
while (n > 1)
{
n--;
var k = robustRandom.Next(n + 1);
var value = directions[k];
directions[k] = directions[n];
directions[n] = value;
}
foreach (var direction in directions)
{
yield return direction;
}
}
/// <summary>
/// Gets tiles in random directions from the given one.
/// </summary>
/// <returns>An enumerable of the adjacent tiles.</returns>
public static IEnumerable<TileRef> AdjacentTilesRandom(this TileRef tile, bool ignoreSpace = false)
{
return tile.GridPosition().AdjacentTilesRandom(ignoreSpace);
}
/// <summary>
/// Gets tiles in random directions from the given one.
/// </summary>
/// <returns>An enumerable of the adjacent tiles.</returns>
public static IEnumerable<TileRef> AdjacentTilesRandom(this EntityCoordinates coordinates, bool ignoreSpace = false)
{
foreach (var direction in RandomDirections())
{
var adjacent = coordinates.Offset(direction).GetTileRef();
if (adjacent == null)
{
continue;
}
if (ignoreSpace && adjacent.Value.Tile.IsEmpty)
{
continue;
}
yield return adjacent.Value;
}
}
public static EntityCoordinates Offset(this EntityCoordinates coordinates, Direction direction)
{
return coordinates.Offset(direction.ToVec());
}
return coordinates.Offset(direction.ToVec());
}
}