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

2
Content.Server/AME/AMENodeGroup.cs
View File

@@ -177,7 +177,7 @@ namespace Content.Server.AME
intensity = Math.Min(intensity, 8); intensity = Math.Min(intensity, 8);
EntitySystem.Get<ExplosionSystem>().SpawnExplosion(epicenter.Owner.Uid, intensity / 2, intensity, intensity * 2, intensity * 3); EntitySystem.Get<ExplosionSystem>().SpawnExplosion(epicenter.OwnerUid, intensity / 2, intensity, intensity * 2, intensity * 3);
} }
} }
} }

2
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -126,7 +126,7 @@ namespace Content.Server.Administration
verb.Act = () => verb.Act = () =>
{ {
var coords = args.Target.Transform.Coordinates; var coords = args.Target.Transform.Coordinates;
Timer.Spawn(_gameTiming.TickPeriod, () => _explosions.SpawnExplosion(coords, 0, 1, 2, 1), CancellationToken.None); Timer.Spawn(_gameTiming.TickPeriod, () => _explosions.SpawnExplosion(coords, 0, 1, 2, 1, args.TargetUid), CancellationToken.None);
if (args.Target.TryGetComponent(out SharedBodyComponent? body)) if (args.Target.TryGetComponent(out SharedBodyComponent? body))
{ {
body.Gib(); body.Gib();

2
Content.Server/Explosion/Components/ClusterFlashComponent.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Server.Explosion.Components
if (grenade.Deleted) if (grenade.Deleted)
return; return;
EntitySystem.Get<TriggerSystem>().Trigger(grenade, eventArgs.User); EntitySystem.Get<TriggerSystem>().Trigger(grenade, eventArgs.User.Uid);
}); });
} }

4
Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Explosion.Components
private float _delay = 0f; private float _delay = 0f;
// TODO: Need to split this out so it's a generic "OnUseTimerTrigger" component. // TODO: Need to split this out so it's a generic "OnUseTimerTrigger" component.
public void Trigger(IEntity user) public void Trigger(EntityUid user)
{ {
if (Owner.TryGetComponent(out AppearanceComponent? appearance)) if (Owner.TryGetComponent(out AppearanceComponent? appearance))
appearance.SetData(TriggerVisuals.VisualState, TriggerVisualState.Primed); appearance.SetData(TriggerVisuals.VisualState, TriggerVisualState.Primed);
@@ -26,7 +26,7 @@ namespace Content.Server.Explosion.Components
bool IUse.UseEntity(UseEntityEventArgs eventArgs) bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{ {
Trigger(eventArgs.User); Trigger(eventArgs.User.Uid);
return true; return true;
} }
} }

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

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

34
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -1,10 +1,14 @@
using System; using System;
using Content.Server.Administration.Logs;
using Content.Server.Doors.Components; using Content.Server.Doors.Components;
using Content.Server.Explosion.Components; using Content.Server.Explosion.Components;
using Content.Server.Flash; using Content.Server.Flash;
using Content.Server.Flash.Components; using Content.Server.Flash.Components;
using Content.Server.Projectiles.Components;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Database;
using Content.Shared.Doors; using Content.Shared.Doors;
using Content.Shared.Throwing;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -21,9 +25,9 @@ namespace Content.Server.Explosion.EntitySystems
public class TriggerEvent : HandledEntityEventArgs public class TriggerEvent : HandledEntityEventArgs
{ {
public IEntity Triggered { get; } public IEntity Triggered { get; }
public IEntity? User { get; } public EntityUid? User { get; }
public TriggerEvent(IEntity triggered, IEntity? user = null) public TriggerEvent(IEntity triggered, EntityUid? user = null)
{ {
Triggered = triggered; Triggered = triggered;
User = user; User = user;
@@ -35,6 +39,7 @@ namespace Content.Server.Explosion.EntitySystems
{ {
[Dependency] private readonly ExplosionSystem _explosions = default!; [Dependency] private readonly ExplosionSystem _explosions = default!;
[Dependency] private readonly FlashSystem _flashSystem = default!; [Dependency] private readonly FlashSystem _flashSystem = default!;
[Dependency] private readonly AdminLogSystem _logSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -53,11 +58,11 @@ namespace Content.Server.Explosion.EntitySystems
{ {
if (!EntityManager.TryGetComponent(uid, out ExplosiveComponent? explosiveComponent)) return; if (!EntityManager.TryGetComponent(uid, out ExplosiveComponent? explosiveComponent)) return;
Explode(uid, explosiveComponent); Explode(uid, explosiveComponent, args.User);
} }
// You really shouldn't call this directly (TODO Change that when ExplosionHelper gets changed). // You really shouldn't call this directly (TODO Change that when ExplosionHelper gets changed).
public void Explode(EntityUid uid, ExplosiveComponent component) public void Explode(EntityUid uid, ExplosiveComponent component, EntityUid? user = null)
{ {
if (component.Exploding) if (component.Exploding)
{ {
@@ -65,7 +70,12 @@ namespace Content.Server.Explosion.EntitySystems
} }
component.Exploding = true; component.Exploding = true;
_explosions.SpawnExplosion(uid, component.DevastationRange, component.HeavyImpactRange, component.LightImpactRange, component.FlashRange); _explosions.SpawnExplosion(uid,
component.DevastationRange,
component.HeavyImpactRange,
component.LightImpactRange,
component.FlashRange,
user);
EntityManager.QueueDeleteEntity(uid); EntityManager.QueueDeleteEntity(uid);
} }
#endregion #endregion
@@ -76,7 +86,7 @@ namespace Content.Server.Explosion.EntitySystems
if (component.Flashed) return; if (component.Flashed) return;
// TODO Make flash durations sane ffs. // TODO Make flash durations sane ffs.
_flashSystem.FlashArea(uid, args.User?.Uid, component.Range, component.Duration * 1000f); _flashSystem.FlashArea(uid, args.User, component.Range, component.Duration * 1000f);
component.Flashed = true; component.Flashed = true;
} }
#endregion #endregion
@@ -113,16 +123,22 @@ namespace Content.Server.Explosion.EntitySystems
private void HandleCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args) private void HandleCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args)
{ {
Trigger(component.Owner); EntityUid? user = null;
if (EntityManager.TryGetComponent(uid, out ProjectileComponent projectile))
user = projectile.Shooter;
else if (EntityManager.TryGetComponent(uid, out ThrownItemComponent thrown))
user = thrown.Thrower?.Uid;
Trigger(component.Owner, user);
} }
public void Trigger(IEntity trigger, IEntity? user = null) public void Trigger(IEntity trigger, EntityUid? user = null)
{ {
var triggerEvent = new TriggerEvent(trigger, user); var triggerEvent = new TriggerEvent(trigger, user);
EntityManager.EventBus.RaiseLocalEvent(trigger.Uid, triggerEvent); EntityManager.EventBus.RaiseLocalEvent(trigger.Uid, triggerEvent);
} }
public void HandleTimerTrigger(TimeSpan delay, IEntity triggered, IEntity? user = null) public void HandleTimerTrigger(TimeSpan delay, IEntity triggered, EntityUid? user = null)
{ {
if (delay.TotalSeconds <= 0) if (delay.TotalSeconds <= 0)
{ {

2
Content.Shared.Database/LogType.cs
View File

@@ -46,7 +46,7 @@ public enum LogType
HitScanHit = 42, HitScanHit = 42,
Suicide = 43, Suicide = 43,
Explosion = 44, Explosion = 44,
Radiation = 45, Radiation = 45, // Unused
Barotrauma = 46, Barotrauma = 46,
Flammable = 47, Flammable = 47,
Asphyxiation = 48, Asphyxiation = 48,

15
Content.Shared/Damage/Components/DamageableComponent.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Acts; using Content.Shared.Acts;
using Content.Shared.Damage.Prototypes; using Content.Shared.Damage.Prototypes;
using Content.Shared.Damage;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.Radiation; using Content.Shared.Radiation;
using Robust.Shared.Analyzers; using Robust.Shared.Analyzers;
@@ -13,8 +12,6 @@ using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
namespace Content.Shared.Damage namespace Content.Shared.Damage
{ {
@@ -95,11 +92,7 @@ namespace Content.Shared.Damage
damage.DamageDict.Add(typeID, damageValue); damage.DamageDict.Add(typeID, damageValue);
} }
var actual = EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage); EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage);
// should logging be disabled during rad storms? a lot of entities are going to be damaged.
if (actual != null && !actual.Empty)
EntitySystem.Get<SharedAdminLogSystem>().Add(LogType.Radiation, $"{Owner} took {actual.Total} radiation damage");
} }
// TODO EXPLOSION Remove this. // TODO EXPLOSION Remove this.
@@ -120,11 +113,7 @@ namespace Content.Shared.Damage
damage.DamageDict.Add(typeID, damageValue); damage.DamageDict.Add(typeID, damageValue);
} }
var actual = EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage); EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage);
// will logging handle nukes?
if (actual != null && !actual.Empty)
EntitySystem.Get<SharedAdminLogSystem>().Add(LogType.Explosion, $"{Owner} took {actual.Total} explosion damage");
} }
} }

57
Content.Shared/Damage/Systems/DamageableSystem.cs
View File

@@ -1,7 +1,5 @@
using System.Linq; using System.Linq;
using Content.Shared.Administration.Logs;
using Content.Shared.Damage.Prototypes; using Content.Shared.Damage.Prototypes;
using Content.Shared.Database;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
@@ -15,8 +13,6 @@ namespace Content.Shared.Damage
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly SharedAdminLogSystem _logs = default!;
public override void Initialize() public override void Initialize()
{ {
SubscribeLocalEvent<DamageableComponent, ComponentInit>(DamageableInit); SubscribeLocalEvent<DamageableComponent, ComponentInit>(DamageableInit);
@@ -24,45 +20,6 @@ namespace Content.Shared.Damage
SubscribeLocalEvent<DamageableComponent, ComponentGetState>(DamageableGetState); SubscribeLocalEvent<DamageableComponent, ComponentGetState>(DamageableGetState);
} }
/// <summary>
/// Update the total damage value and optionally add to admin logs
/// </summary>
protected virtual void SetTotalDamage(DamageableComponent damageable, FixedPoint2 @new, bool logChange)
{
var owner = damageable.Owner;
var old = damageable.TotalDamage;
if (@new == old)
{
return;
}
damageable.TotalDamage = @new;
if (!logChange)
return;
LogType logType;
string type;
FixedPoint2 change;
if (@new > old)
{
logType = LogType.Damaged;
type = "received";
change = @new - old;
}
else
{
logType = LogType.Healed;
type = "healed";
change = old - @new;
}
_logs.Add(logType, $"{owner} {type} {change} damage. Old: {old} | New: {@new}");
}
/// <summary> /// <summary>
/// Initialize a damageable component /// Initialize a damageable component
/// </summary> /// </summary>
@@ -111,7 +68,7 @@ namespace Content.Shared.Damage
public void SetDamage(DamageableComponent damageable, DamageSpecifier damage) public void SetDamage(DamageableComponent damageable, DamageSpecifier damage)
{ {
damageable.Damage = damage; damageable.Damage = damage;
DamageChanged(damageable, false); DamageChanged(damageable);
} }
/// <summary> /// <summary>
@@ -121,11 +78,11 @@ namespace Content.Shared.Damage
/// This updates cached damage information, flags the component as dirty, and raises a damage changed event. /// This updates cached damage information, flags the component as dirty, and raises a damage changed event.
/// The damage changed event is used by other systems, such as damage thresholds. /// The damage changed event is used by other systems, such as damage thresholds.
/// </remarks> /// </remarks>
public void DamageChanged(DamageableComponent component, bool logChange, DamageSpecifier? damageDelta = null, public void DamageChanged(DamageableComponent component, DamageSpecifier? damageDelta = null,
bool interruptsDoAfters = true) bool interruptsDoAfters = true)
{ {
component.DamagePerGroup = component.Damage.GetDamagePerGroup(); component.DamagePerGroup = component.Damage.GetDamagePerGroup();
SetTotalDamage(component, component.Damage.Total, logChange); component.TotalDamage = component.Damage.Total;
component.Dirty(); component.Dirty();
if (EntityManager.TryGetComponent<AppearanceComponent>(component.OwnerUid, out var appearance) && damageDelta != null) if (EntityManager.TryGetComponent<AppearanceComponent>(component.OwnerUid, out var appearance) && damageDelta != null)
@@ -146,7 +103,7 @@ namespace Content.Shared.Damage
/// null if the user had no applicable components that can take damage. /// null if the user had no applicable components that can take damage.
/// </returns> /// </returns>
public DamageSpecifier? TryChangeDamage(EntityUid uid, DamageSpecifier damage, bool ignoreResistances = false, public DamageSpecifier? TryChangeDamage(EntityUid uid, DamageSpecifier damage, bool ignoreResistances = false,
bool interruptsDoAfters = true, bool logChange = false) bool interruptsDoAfters = true)
{ {
if (!EntityManager.TryGetComponent<DamageableComponent>(uid, out var damageable)) if (!EntityManager.TryGetComponent<DamageableComponent>(uid, out var damageable))
{ {
@@ -195,7 +152,7 @@ namespace Content.Shared.Damage
if (!delta.Empty) if (!delta.Empty)
{ {
DamageChanged(damageable, logChange, delta, interruptsDoAfters); DamageChanged(damageable, delta, interruptsDoAfters);
} }
return delta; return delta;
@@ -222,7 +179,7 @@ namespace Content.Shared.Damage
// Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an // Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
// empty damage delta. // empty damage delta.
DamageChanged(component, false, new DamageSpecifier()); DamageChanged(component, new DamageSpecifier());
} }
private void DamageableGetState(EntityUid uid, DamageableComponent component, ref ComponentGetState args) private void DamageableGetState(EntityUid uid, DamageableComponent component, ref ComponentGetState args)
@@ -247,7 +204,7 @@ namespace Content.Shared.Damage
if (!delta.Empty) if (!delta.Empty)
{ {
component.Damage = newDamage; component.Damage = newDamage;
DamageChanged(component, false, delta); DamageChanged(component, delta);
} }
} }
} }