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

Add more pretty strings to logs (#5768)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-14 00:22:58 +13:00
committed by GitHub
parent fa1de1a75a
commit 7f81f0b8b8
41 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
View File

@@ -58,7 +58,7 @@ namespace Content.Server.Damage.Systems
var dmg = _damageableSystem.TryChangeDamage(uid, component.Damage * damageScale);
if (dmg != null)
_logSystem.Add(LogType.Damaged, $"{component.Owner} took {dmg.Total} damage from a high speed collision");
_logSystem.Add(LogType.Damaged, $"{ToPrettyString(component.Owner):entity} took {dmg.Total:damage} damage from a high speed collision");
}
}
}

2
Content.Server/Damage/Systems/DamageOnLandSystem.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.Damage.Systems
if (dmg == null)
return;
_logSystem.Add(LogType.Landed, $"{component.Owner} received {dmg.Total} damage from landing");
_logSystem.Add(LogType.Landed, $"{ToPrettyString(component.Owner):entity} received {dmg.Total:damage} damage from landing");
}
}
}

4
Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.Damage.Systems
if (dmg != null)
_logSystem.Add(LogType.Damaged,
$"{args.User} used {args.Used} as a welder to deal {dmg.Total} damage to {args.Target}");
$"{ToPrettyString(args.User):user} used {ToPrettyString(args.Used):used} as a welder to deal {dmg.Total:damage} damage to {ToPrettyString(args.Target):target}");
args.Handled = true;
}
@@ -47,7 +47,7 @@ namespace Content.Server.Damage.Systems
if (dmg != null)
_logSystem.Add(LogType.Damaged,
$"{args.User} used {args.Used} as a tool to deal {dmg.Total} damage to {args.Target}");
$"{ToPrettyString(args.User):user} used {ToPrettyString(args.Used):used} as a tool to deal {dmg.Total:damage} damage to {ToPrettyString(args.Target):target}");
args.Handled = true;
}

2
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.Damage.Systems
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances);
if (dmg != null)
_logSystem.Add(LogType.ThrowHit, $"{args.Target} received {dmg.Total} damage from collision");
_logSystem.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.Total:damage} damage from collision");
}
}
}