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

Explosion log fix fix (#24136)

Browse Source 
* Reaction and Explosion admin log coordinates

* Remove extraneous whitespace
This commit is contained in:
Trevor Day
2024-01-15 23:53:46 -08:00
committed by GitHub
parent f33307e766
commit d571ed940f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,10 +249,11 @@ public sealed partial class ExplosionSystem : EntitySystem
{ {
var pos = Transform(uid); var pos = Transform(uid);
var mapPos = _transformSystem.GetMapCoordinates(pos);
var coordinates = _transformSystem.GetMapCoordinates(pos); var posFound = _transformSystem.TryGetMapOrGridCoordinates(uid, out var gridPos, pos);
QueueExplosion(coordinates, typeId, totalIntensity, slope, maxTileIntensity, tileBreakScale, maxTileBreak, canCreateVacuum, addLog: false); QueueExplosion(mapPos, typeId, totalIntensity, slope, maxTileIntensity, tileBreakScale, maxTileBreak, canCreateVacuum, addLog: false);
if (!addLog) if (!addLog)
return; return;
@@ -260,15 +261,15 @@ public sealed partial class ExplosionSystem : EntitySystem
if (user == null) if (user == null)
{ {
_adminLogger.Add(LogType.Explosion, LogImpact.High, _adminLogger.Add(LogType.Explosion, LogImpact.High,
$"{ToPrettyString(uid):entity} exploded ({typeId}) at {coordinates:coordinates} with intensity {totalIntensity} slope {slope}"); $"{ToPrettyString(uid):entity} exploded ({typeId}) at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not found]")} with intensity {totalIntensity} slope {slope}");
} }
else else
{ {
_adminLogger.Add(LogType.Explosion, LogImpact.High, _adminLogger.Add(LogType.Explosion, LogImpact.High,
$"{ToPrettyString(user.Value):user} caused {ToPrettyString(uid):entity} to explode ({typeId}) at {coordinates:coordinates} with intensity {totalIntensity} slope {slope}"); $"{ToPrettyString(user.Value):user} caused {ToPrettyString(uid):entity} to explode ({typeId}) at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not found]")} with intensity {totalIntensity} slope {slope}");
var alertMinExplosionIntensity = _cfg.GetCVar(CCVars.AdminAlertExplosionMinIntensity); var alertMinExplosionIntensity = _cfg.GetCVar(CCVars.AdminAlertExplosionMinIntensity);
if (alertMinExplosionIntensity > -1 && totalIntensity >= alertMinExplosionIntensity) if (alertMinExplosionIntensity > -1 && totalIntensity >= alertMinExplosionIntensity)
_chat.SendAdminAlert(user.Value, $"caused {ToPrettyString(uid)} to explode ({typeId}:{totalIntensity}) at {coordinates:coordinates}"); _chat.SendAdminAlert(user.Value, $"caused {ToPrettyString(uid)} to explode ({typeId}:{totalIntensity}) at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not found]")}");
} }
} }

6
Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs
View File

@@ -201,10 +201,10 @@ namespace Content.Shared.Chemistry.Reaction
reagent, reagent,
unitReactions, EntityManager, null, 1f); unitReactions, EntityManager, null, 1f);
var coordinates = _transformSystem.GetMapCoordinates(soln); var posFound = _transformSystem.TryGetMapOrGridCoordinates(soln, out var gridPos);
_adminLogger.Add(LogType.ChemicalReaction, reaction.Impact, _adminLogger.Add(LogType.ChemicalReaction, reaction.Impact,
$"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at {coordinates}"); $"Chemical reaction {reaction.ID:reaction} occurred with strength {unitReactions:strength} on entity {ToPrettyString(soln):metabolizer} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found]")}");
foreach (var effect in reaction.Effects) foreach (var effect in reaction.Effects)
{ {
@@ -215,7 +215,7 @@ namespace Content.Shared.Chemistry.Reaction
{ {
var entity = args.SolutionEntity; var entity = args.SolutionEntity;
_adminLogger.Add(LogType.ReagentEffect, effect.LogImpact, _adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
$"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at {coordinates}"); $"Reaction effect {effect.GetType().Name:effect} of reaction {reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not Found")}");
} }
effect.Effect(args); effect.Effect(args);