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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Client/StationEvents/RadiationPulseOverlay.cs
View File

@@ -4,11 +4,11 @@ using System.Linq;
using Robust.Client.Graphics;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
namespace Content.Client.StationEvents
{
@@ -93,7 +93,7 @@ namespace Content.Client.StationEvents
(
_baseShader.Duplicate(),
new RadiationShaderInstance(
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pulseEntity).MapPosition.Position,
_entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition.Position,
pulse.Range,
pulse.StartTime,
pulse.EndTime
@@ -104,26 +104,26 @@ namespace Content.Client.StationEvents
}
var activeShaderIds = _pulses.Keys;
foreach (var activePulseUid in activeShaderIds) //Remove all pulses that are added and no longer qualify
foreach (var pulseEntity in activeShaderIds) //Remove all pulses that are added and no longer qualify
{
if (_entityManager.TryGetEntity(activePulseUid, out var pulseEntity) &&
if (_entityManager.EntityExists(pulseEntity) &&
PulseQualifies(pulseEntity, currentEyeLoc) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<RadiationPulseComponent?>(pulseEntity, out var pulse))
_entityManager.TryGetComponent<RadiationPulseComponent?>(pulseEntity, out var pulse))
{
var shaderInstance = _pulses[activePulseUid];
shaderInstance.instance.CurrentMapCoords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pulseEntity).MapPosition.Position;
var shaderInstance = _pulses[pulseEntity];
shaderInstance.instance.CurrentMapCoords = _entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition.Position;
shaderInstance.instance.Range = pulse.Range;
} else {
_pulses[activePulseUid].shd.Dispose();
_pulses.Remove(activePulseUid);
_pulses[pulseEntity].shd.Dispose();
_pulses.Remove(pulseEntity);
}
}
}
private bool PulseQualifies(IEntity pulseEntity, MapCoordinates currentEyeLoc)
private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc)
{
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pulseEntity).MapID == currentEyeLoc.MapId && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(pulseEntity).ParentUid, currentEyeLoc), MaxDist);
return _entityManager.GetComponent<TransformComponent>(pulseEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent<TransformComponent>(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent<TransformComponent>(pulseEntity).ParentUid, currentEyeLoc), MaxDist);
}
private sealed record RadiationShaderInstance(Vector2 CurrentMapCoords, float Range, TimeSpan Start, TimeSpan End)