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

Remove default grids (content) (#2241)

Browse Source 
* Default grids go poof

* Address review

* Update submodule

* Fix DoAfterSystem for entities without grid.

* Fix SubFloorHideSystem for entities without grid.

* Fix ExplosionHelper for coordinates that aren't in a grid

* Fix TurfHelpers' GetWorldTileBox crash in the case of invalid grid

* Fix tile prying component crash when trying to pry space.

* Spill fixes when passing coordinates without grids.

* Are you static'in, son?

* Change SaveLoadSaveTest grid Id hardcoded value
It's still hardcoded, but at least now it's correct!

* Only send debug AI thing if grid is not invalid

* Update submodule.

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Víctor Aguilera Puerto
2020-10-21 17:13:41 +02:00
committed by GitHub
parent 78507ac9a2
commit 48841a274d
14 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -37,8 +37,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
foreach (var comp in EntityManager.ComponentManager.EntityQuery<SubFloorHideComponent>())
{
var gridId = comp.Owner.Transform.GridID;
var grid = _mapManager.GetGrid(gridId);
if (!_mapManager.TryGetGrid(comp.Owner.Transform.GridID, out var grid)) return;
var snapPos = comp.Owner.GetComponent<SnapGridComponent>();
UpdateTile(grid, snapPos.Position);

6
Content.Client/State/GameScreenBase.cs
View File

@@ -209,11 +209,11 @@ namespace Content.Client.State
var mousePosWorld = EyeManager.ScreenToMap(args.PointerLocation);
var entityToClick = GetEntityUnderPosition(mousePosWorld);
if (!MapManager.TryFindGridAt(mousePosWorld, out var grid))
grid = MapManager.GetDefaultGrid(mousePosWorld.MapId);
var coordinates = MapManager.TryFindGridAt(mousePosWorld, out var grid) ? grid.MapToGrid(mousePosWorld) :
EntityCoordinates.FromMap(EntityManager, MapManager, mousePosWorld);
var message = new FullInputCmdMessage(Timing.CurTick, Timing.TickFraction, funcId, args.State,
grid.MapToGrid(mousePosWorld), args.PointerLocation,
coordinates , args.PointerLocation,
entityToClick?.Uid ?? EntityUid.Invalid);
// client side command handlers will always be sent the local player session.

8
Content.Client/UserInterface/ItemSlotManager.cs
View File

@@ -70,12 +70,14 @@ namespace Content.Client.UserInterface
var func = args.Function;
var funcId = _inputManager.NetworkBindMap.KeyFunctionID(args.Function);
var mousePosWorld = _eyeManager.ScreenToMap(args.PointerLocation);
if (!_mapManager.TryFindGridAt(mousePosWorld, out var grid))
grid = _mapManager.GetDefaultGrid(mousePosWorld.MapId);
var coordinates = _mapManager.TryFindGridAt(mousePosWorld, out var grid) ? grid.MapToGrid(mousePosWorld) :
EntityCoordinates.FromMap(_entityManager, _mapManager, mousePosWorld);
var message = new FullInputCmdMessage(_gameTiming.CurTick, _gameTiming.TickFraction, funcId, BoundKeyState.Down,
grid.MapToGrid(mousePosWorld), args.PointerLocation, item.Uid);
coordinates, args.PointerLocation, item.Uid);
// client side command handlers will always be sent the local player session.
var session = _playerManager.LocalPlayer?.Session;

3
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -26,7 +26,8 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>();
server.Post(() =>
{
mapLoader.SaveBlueprint(new GridId(2), "save load save 1.yml");
// TODO: Un-hardcode the grid Id for this test.
mapLoader.SaveBlueprint(new GridId(1), "save load save 1.yml");
var mapId = mapManager.CreateMap();
var grid = mapLoader.LoadBlueprint(mapId, "save load save 1.yml");
mapLoader.SaveBlueprint(grid.Index, "save load save 2.yml");

8
Content.Server/Atmos/TileAtmosphere.cs
View File

@@ -42,10 +42,7 @@ namespace Content.Server.Atmos
[ViewVariables] private int _currentCycle;
[ViewVariables]
private static GasTileOverlaySystem _gasTileOverlaySystem;
[ViewVariables]
public float Temperature {get; private set; } = Atmospherics.T20C;
public float Temperature { get; private set; } = Atmospherics.T20C;
[ViewVariables]
private float _temperatureArchived = Atmospherics.T20C;
@@ -1138,8 +1135,7 @@ namespace Content.Server.Atmos
{
if (Air == null) return;
_gasTileOverlaySystem ??= EntitySystem.Get<GasTileOverlaySystem>();
_gasTileOverlaySystem.Invalidate(GridIndex, GridIndices);
_gridAtmosphereComponent.GasTileOverlaySystem.Invalidate(GridIndex, GridIndices);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

64
Content.Server/Explosions/ExplosionHelper.cs
View File

@@ -75,42 +75,44 @@ namespace Content.Server.Explosions
//Tile damage calculation mockup
//TODO: make it into some sort of actual damage component or whatever the boys think is appropriate
var mapGrid = mapManager.GetGrid(coords.GetGridId(entityManager));
var circle = new Circle(coords.Position, maxRange);
var tiles = mapGrid.GetTilesIntersecting(circle);
foreach (var tile in tiles)
if (mapManager.TryGetGrid(coords.GetGridId(entityManager), out var mapGrid))
{
var tileLoc = mapGrid.GridTileToLocal(tile.GridIndices);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
var baseTurfs = tileDef.BaseTurfs;
if (baseTurfs.Count == 0)
var circle = new Circle(coords.Position, maxRange);
var tiles = mapGrid?.GetTilesIntersecting(circle);
foreach (var tile in tiles)
{
continue;
}
var tileLoc = mapGrid.GridTileToLocal(tile.GridIndices);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
var baseTurfs = tileDef.BaseTurfs;
if (baseTurfs.Count == 0)
{
continue;
}
if (!tileLoc.TryDistance(entityManager, coords, out var distance))
{
continue;
}
if (!tileLoc.TryDistance(entityManager, coords, out var distance))
{
continue;
}
var zeroTile = new Tile(tileDefinitionManager[baseTurfs[0]].TileId);
var previousTile = new Tile(tileDefinitionManager[baseTurfs[^1]].TileId);
var zeroTile = new Tile(tileDefinitionManager[baseTurfs[0]].TileId);
var previousTile = new Tile(tileDefinitionManager[baseTurfs[^1]].TileId);
switch (distance)
{
case var d when d < devastationRange:
mapGrid.SetTile(tileLoc, zeroTile);
break;
case var d when d < heavyImpactRange
&& !previousTile.IsEmpty
&& robustRandom.Prob(0.8f):
mapGrid.SetTile(tileLoc, previousTile);
break;
case var d when d < lightImpactRange
&& !previousTile.IsEmpty
&& robustRandom.Prob(0.5f):
mapGrid.SetTile(tileLoc, previousTile);
break;
switch (distance)
{
case var d when d < devastationRange:
mapGrid.SetTile(tileLoc, zeroTile);
break;
case var d when d < heavyImpactRange
&& !previousTile.IsEmpty
&& robustRandom.Prob(0.8f):
mapGrid.SetTile(tileLoc, previousTile);
break;
case var d when d < lightImpactRange
&& !previousTile.IsEmpty
&& robustRandom.Prob(0.5f):
mapGrid.SetTile(tileLoc, previousTile);
break;
}
}
}

7
Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
View File

@@ -8,6 +8,7 @@ using Content.Server.Atmos;
using Content.Server.GameObjects.Components.Atmos.Piping;
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Atmos;
using Content.Shared.Atmos;
using Content.Shared.Maps;
using Robust.Server.GameObjects.EntitySystems.TileLookup;
@@ -39,6 +40,7 @@ namespace Content.Server.GameObjects.Components.Atmos
[Robust.Shared.IoC.Dependency] private IServerEntityManager _serverEntityManager = default!;
public GridTileLookupSystem GridTileLookupSystem { get; private set; } = default!;
internal GasTileOverlaySystem GasTileOverlaySystem { get; private set; } = default!;
public AtmosphereSystem AtmosphereSystem { get; private set; } = default!;
/// <summary>
@@ -173,10 +175,11 @@ namespace Content.Server.GameObjects.Components.Atmos
public override void Initialize()
{
base.Initialize();
RepopulateTiles();
GridTileLookupSystem = EntitySystem.Get<GridTileLookupSystem>();
GasTileOverlaySystem = EntitySystem.Get<GasTileOverlaySystem>();
AtmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
RepopulateTiles();
}
public override void OnAdd()

14
Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs
View File

@@ -66,8 +66,8 @@ namespace Content.Server.GameObjects.Components.Fluids
var entityManager = IoCManager.Resolve<IEntityManager>();
var serverEntityManager = IoCManager.Resolve<IServerEntityManager>();
var gridId = coordinates.GetGridId(entityManager);
var mapGrid = mapManager.GetGrid(gridId);
if (!mapManager.TryGetGrid(coordinates.GetGridId(entityManager), out var mapGrid))
return null; // Let's not spill to space.
// If space return early, let that spill go out into the void
var tileRef = mapGrid.GetTileRef(coordinates);
@@ -78,13 +78,11 @@ namespace Content.Server.GameObjects.Components.Fluids
// Get normalized co-ordinate for spill location and spill it in the centre
// TODO: Does SnapGrid or something else already do this?
var spillTileMapGrid = mapManager.GetGrid(gridId);
var spillTileRef = spillTileMapGrid.GetTileRef(coordinates).GridIndices;
var spillGridCoords = spillTileMapGrid.GridTileToLocal(spillTileRef);
var spillGridCoords = mapGrid.GridTileToLocal(tileRef.GridIndices);
var spilt = false;
foreach (var spillEntity in entityManager.GetEntitiesAt(spillTileMapGrid.ParentMapId, spillGridCoords.Position))
foreach (var spillEntity in entityManager.GetEntitiesAt(mapGrid.ParentMapId, spillGridCoords.Position))
{
if (!spillEntity.TryGetComponent(out PuddleComponent? puddleComponent))
{
@@ -167,7 +165,9 @@ namespace Content.Server.GameObjects.Components.Fluids
// Get normalized co-ordinate for spill location and spill it in the centre
// TODO: Does SnapGrid or something else already do this?
var spillTileMapGrid = mapManager.GetGrid(gridId);
if (!mapManager.TryGetGrid(gridId, out var spillTileMapGrid))
return null; // Let's not spill to invalid grids.
var spillGridCoords = spillTileMapGrid.GridTileToLocal(tileRef.GridIndices);
var spilt = false;

4
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -36,7 +36,9 @@ namespace Content.Server.GameObjects.Components.Interactable
if (!Owner.TryGetComponent<ToolComponent>(out var tool) && _toolComponentNeeded)
return;
var mapGrid = _mapManager.GetGrid(clickLocation.GetGridId(Owner.EntityManager));
if (!_mapManager.TryGetGrid(clickLocation.GetGridId(Owner.EntityManager), out var mapGrid))
return;
var tile = mapGrid.GetTileRef(clickLocation);
var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);

2
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs
View File

@@ -113,7 +113,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
private void SetPowerTransferRange(int newPowerTransferRange)
{
foreach (var receiver in _linkedReceivers)
foreach (var receiver in _linkedReceivers.ToArray())
{
receiver.ClearProvider();
}

5
Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
View File

@@ -621,7 +621,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
/// <param name="chunk"></param>
private void GenerateRegions(PathfindingChunk chunk)
{
// Grid deleted while update queued.
// Grid deleted while update queued, or invalid grid.
if (!_mapManager.TryGetGrid(chunk.GridId, out _))
{
return;
@@ -688,7 +688,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
private void SendDebugMessage(PlayerAttachSystemMessage message)
{
var playerGrid = message.Entity.Transform.GridID;
SendRegionsDebugMessage(playerGrid);
if(playerGrid.IsValid())
SendRegionsDebugMessage(playerGrid);
}
private void SendRegionsDebugMessage(GridId gridId)

6
Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
View File

@@ -6,24 +6,20 @@ using System.Threading.Tasks;
using Content.Server.GameObjects.Components;
using Content.Shared.GameObjects.Components.Damage;
using JetBrains.Annotations;
using Robust.Server.Interfaces.Timing;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.IoC;
namespace Content.Server.GameObjects.EntitySystems.DoAfter
{
[UsedImplicitly]
public sealed class DoAfterSystem : EntitySystem
{
[Dependency] private readonly IPauseManager _pauseManager = default!;
public override void Update(float frameTime)
{
base.Update(frameTime);
foreach (var comp in ComponentManager.EntityQuery<DoAfterComponent>())
{
if (_pauseManager.IsGridPaused(comp.Owner.Transform.GridID)) continue;
if (comp.Owner.Paused) continue;
var cancelled = new List<DoAfter>(0);
var finished = new List<DoAfter>(0);

20
Content.Shared/Maps/TurfHelpers.cs
View File

@@ -187,21 +187,17 @@ namespace Content.Shared.Maps
private static Box2 GetWorldTileBox(TileRef turf)
{
var map = IoCManager.Resolve<IMapManager>();
var tileGrid = map.GetGrid(turf.GridIndex);
// This is scaled to 90 % so it doesn't encompass walls on other tiles.
var tileBox = Box2.UnitCentered.Scale(tileGrid.TileSize).Scale(0.9f);
return tileBox.Translated(tileGrid.GridTileToWorldPos(turf.GridIndices));
}
var tileBox = Box2.UnitCentered.Scale(0.9f);
/// <summary>
/// Creates a box the size of a tile.
/// </summary>
private static Box2 GetTileBox(this TileRef turf)
{
var map = IoCManager.Resolve<IMapManager>();
var tileGrid = map.GetGrid(turf.GridIndex);
return Box2.UnitCentered.Scale(tileGrid.TileSize);
if (map.TryGetGrid(turf.GridIndex, out var tileGrid))
{
tileBox = tileBox.Scale(tileGrid.TileSize);
return tileBox.Translated(tileGrid.GridTileToWorldPos(turf.GridIndices));
}
return tileBox;
}
}
}

2
RobustToolbox

Submodule RobustToolbox updated: e3f2e36ad4...6a9cb790c0