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

17
Content.Server/StationEvents/RadiationStorm.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.Utility;
using JetBrains.Annotations;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects.Systems;
@@ -17,7 +18,7 @@ namespace Content.Server.StationEvents
public sealed class RadiationStorm : StationEvent
{
// Based on Goonstation style radiation storm with some TG elements (announcer, etc.)
[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private IMapManager _mapManager = default!;
[Dependency] private IRobustRandom _robustRandom = default!;
@@ -65,12 +66,12 @@ namespace Content.Server.StationEvents
public override void Shutdown()
{
base.Shutdown();
// IOC uninject?
_entityManager = null;
_mapManager = null;
_robustRandom = null;
var componentManager = IoCManager.Resolve<IComponentManager>();
foreach (var overlay in componentManager.EntityQuery<ServerOverlayEffectsComponent>())
@@ -78,7 +79,7 @@ namespace Content.Server.StationEvents
overlay.RemoveOverlay(SharedOverlayID.RadiationPulseOverlay);
}
}
public override void Update(float frameTime)
{
_timeElapsed += frameTime;
@@ -112,20 +113,20 @@ namespace Content.Server.StationEvents
}
private void SpawnPulse(IMapGrid mapGrid)
{
{
_entityManager.SpawnEntity("RadiationPulse", FindRandomGrid(mapGrid));
_timeUntilPulse = _robustRandom.NextFloat() * (MaxPulseDelay - MinPulseDelay) + MinPulseDelay;
_pulsesRemaining -= 1;
}
private GridCoordinates FindRandomGrid(IMapGrid mapGrid)
private EntityCoordinates FindRandomGrid(IMapGrid mapGrid)
{
// TODO: Need to get valid tiles? (maybe just move right if the tile we chose is invalid?)
var randomX = _robustRandom.Next((int) mapGrid.WorldBounds.Left, (int) mapGrid.WorldBounds.Right);
var randomY = _robustRandom.Next((int) mapGrid.WorldBounds.Bottom, (int) mapGrid.WorldBounds.Top);
return mapGrid.GridTileToLocal(new MapIndices(randomX, randomY));
return mapGrid.ToCoordinates(randomX, randomY);
}
}
}
}