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

Remove radiation & explosion damage logs. Add better explosion-trigger logs (#5689)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-05 15:34:32 +13:00
committed by GitHub
parent 8a236cdba8
commit ae65418c52
9 changed files with 62 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -294,6 +294,7 @@ namespace Content.Server.Explosion.EntitySystems
int heavyImpactRange = 0,
int lightImpactRange = 0,
int flashRange = 0,
EntityUid? user = null,
ExplosiveComponent? explosive = null,
TransformComponent? transform = null)
{
@@ -306,7 +307,7 @@ namespace Content.Server.Explosion.EntitySystems
if (explosive is { Exploding: false })
{
_triggers.Explode(entity, explosive);
_triggers.Explode(entity, explosive, user);
}
else
{
@@ -322,7 +323,7 @@ namespace Content.Server.Explosion.EntitySystems
var epicenter = transform.Coordinates;
SpawnExplosion(epicenter, devastationRange, heavyImpactRange, lightImpactRange, flashRange);
SpawnExplosion(epicenter, devastationRange, heavyImpactRange, lightImpactRange, flashRange, entity, user);
}
}
@@ -331,7 +332,9 @@ namespace Content.Server.Explosion.EntitySystems
int devastationRange = 0,
int heavyImpactRange = 0,
int lightImpactRange = 0,
int flashRange = 0)
int flashRange = 0,
EntityUid? entity = null,
EntityUid? user = null)
{
var mapId = epicenter.GetMapId(EntityManager);
if (mapId == MapId.Nullspace)
@@ -339,8 +342,22 @@ namespace Content.Server.Explosion.EntitySystems
return;
}
_logSystem.Add(LogType.Damaged, LogImpact.High ,
$"Spawned explosion at {epicenter} with range {devastationRange}/{heavyImpactRange}/{lightImpactRange}/{flashRange}");
// logging
var text = $"{epicenter} with range {devastationRange}/{heavyImpactRange}/{lightImpactRange}/{flashRange}";
if (entity == null)
{
_logSystem.Add(LogType.Explosion, LogImpact.High, $"Explosion spawned at {text}");
}
else if (user == null)
{
_logSystem.Add(LogType.Explosion, LogImpact.High,
$"{EntityManager.GetEntity(entity.Value)} exploded at {text}");
}
else
{
_logSystem.Add(LogType.Explosion, LogImpact.High,
$"{EntityManager.GetEntity(user.Value)} caused {EntityManager.GetEntity(entity.Value)} to explode at {text}");
}
var maxRange = MathHelper.Max(devastationRange, heavyImpactRange, lightImpactRange, 0);
var epicenterMapPos = epicenter.ToMapPos(EntityManager);