juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup SpecialRespawnSystem (#36087)

Browse Source 
* grid.TileIndicesFor -> _map.TileIndicesFor

* coords.ToMap -> _transform.ToMapCoordinates

* grid.TryGetTileRef -> _map.TryGetTileRef

* grid.GridTileToWorldPos -> _map.GridTileToWorldPos

* grid.WorldToTile -> _map.WorldToTile

* grid.GridTileToLocal -> _map.GridTileToLocal

* Formatting why not
This commit is contained in:
Tayrtahn
2025-03-25 18:16:48 -04:00
committed by GitHub
parent 8dfa2e8f95
commit 1364bfd422
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Respawn/SpecialRespawnSystem.cs
View File

@@ -111,7 +111,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
if (tile.IsSpace(_tileDefinitionManager)
|| _turf.IsTileBlocked(tile, CollisionGroup.MobMask)
|| !_atmosphere.IsTileMixtureProbablySafe(entityGridUid, entityMapUid.Value,
grid.TileIndicesFor(mapPos)))
_map.TileIndicesFor((entityGridUid.Value, grid), mapPos)))
{
continue;
}
@@ -136,7 +136,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords)
{
var entity = Spawn(prototype, coords);
_adminLog.Add(LogType.Respawn, LogImpact.Extreme, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager, _transform)} as {ToPrettyString(entity)}");
_adminLog.Add(LogType.Respawn, LogImpact.Extreme, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {_transform.ToMapCoordinates(coords)} as {ToPrettyString(entity)}");
_chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}");
}
@@ -157,7 +157,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
var xform = Transform(targetGrid);
if (!grid.TryGetTileRef(xform.Coordinates, out var tileRef))
if (!_map.TryGetTileRef(targetGrid, grid, xform.Coordinates, out var tileRef))
return false;
var tile = tileRef.GridIndices;
@@ -169,12 +169,12 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
//Obviously don't put anything ridiculous in here
for (var i = 0; i < maxAttempts; i++)
{
var randomX = _random.Next((int) gridBounds.Left, (int) gridBounds.Right);
var randomY = _random.Next((int) gridBounds.Bottom, (int) gridBounds.Top);
var randomX = _random.Next((int)gridBounds.Left, (int)gridBounds.Right);
var randomY = _random.Next((int)gridBounds.Bottom, (int)gridBounds.Top);
tile = new Vector2i(randomX - (int) gridPos.X, randomY - (int) gridPos.Y);
var mapPos = grid.GridTileToWorldPos(tile);
var mapTarget = grid.WorldToTile(mapPos);
tile = new Vector2i(randomX - (int)gridPos.X, randomY - (int)gridPos.Y);
var mapPos = _map.GridTileToWorldPos(targetGrid, grid, tile);
var mapTarget = _map.WorldToTile(targetGrid, grid, mapPos);
var circle = new Circle(mapPos, 2);
foreach (var newTileRef in _map.GetTilesIntersecting(targetGrid, grid, circle))
@@ -183,7 +183,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
continue;
found = true;
targetCoords = grid.GridTileToLocal(tile);
targetCoords = _map.GridTileToLocal(targetGrid, grid, tile);
break;
}