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

Fix pulses spawning on invalid grids and make the first pulse not instant (#2238)

Browse Source 
* Fix radiation pulses spawning on invalid grids

* ok move that down

* ok liberal

* by paul

* why have i done this
This commit is contained in:
DrSmugleaf
2020-10-12 00:48:43 +02:00
committed by GitHub
parent c029329070
commit 723f4555cf
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,12 +48,18 @@ namespace Content.Server.StationEvents
private const float MinPulseDelay = 0.2f; private const float MinPulseDelay = 0.2f;
private const float MaxPulseDelay = 0.8f; private const float MaxPulseDelay = 0.8f;
private void ResetTimeUntilPulse()
{
_timeUntilPulse = _robustRandom.NextFloat() * (MaxPulseDelay - MinPulseDelay) + MinPulseDelay;
}
public override void Startup() public override void Startup()
{ {
base.Startup(); base.Startup();
EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/radiation.ogg"); EntitySystem.Get<AudioSystem>().PlayGlobal("/Audio/Announcements/radiation.ogg");
IoCManager.InjectDependencies(this); IoCManager.InjectDependencies(this);
ResetTimeUntilPulse();
_timeElapsed = 0.0f; _timeElapsed = 0.0f;
_pulsesRemaining = _robustRandom.Next(30, 100); _pulsesRemaining = _robustRandom.Next(30, 100);
@@ -117,20 +123,36 @@ namespace Content.Server.StationEvents
private void SpawnPulse(IMapGrid mapGrid) private void SpawnPulse(IMapGrid mapGrid)
{ {
var pulse = _entityManager.SpawnEntity("RadiationPulse", FindRandomGrid(mapGrid)); if (!TryFindRandomGrid(mapGrid, out var coordinates))
return;
var pulse = _entityManager.SpawnEntity("RadiationPulse", coordinates);
pulse.GetComponent<RadiationPulseComponent>().DoPulse(); pulse.GetComponent<RadiationPulseComponent>().DoPulse();
_timeUntilPulse = _robustRandom.NextFloat() * (MaxPulseDelay - MinPulseDelay) + MinPulseDelay; ResetTimeUntilPulse();
_pulsesRemaining -= 1; _pulsesRemaining -= 1;
} }
private EntityCoordinates FindRandomGrid(IMapGrid mapGrid) private bool TryFindRandomGrid(IMapGrid mapGrid, out EntityCoordinates coordinates)
{ {
// TODO: Need to get valid tiles? (maybe just move right if the tile we chose is invalid?) if (!mapGrid.Index.IsValid())
{
coordinates = default;
return false;
}
var randomX = _robustRandom.Next((int) mapGrid.WorldBounds.Left, (int) mapGrid.WorldBounds.Right); var randomX = _robustRandom.Next((int) mapGrid.WorldBounds.Left, (int) mapGrid.WorldBounds.Right);
var randomY = _robustRandom.Next((int) mapGrid.WorldBounds.Bottom, (int) mapGrid.WorldBounds.Top); var randomY = _robustRandom.Next((int) mapGrid.WorldBounds.Bottom, (int) mapGrid.WorldBounds.Top);
return mapGrid.ToCoordinates(randomX, randomY); coordinates = mapGrid.ToCoordinates(randomX, randomY);
// TODO: Need to get valid tiles? (maybe just move right if the tile we chose is invalid?)
if (!coordinates.IsValid(_entityManager))
{
coordinates = default;
return false;
}
return true;
} }
} }
} }