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

add melee miss logs (#18671)

Browse Source
This commit is contained in:
Chief-Engineer
2023-08-04 21:17:13 -05:00
committed by GitHub
parent 6a19c1a0f6
commit cca2f52a30
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -590,6 +590,16 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
// is when a melee weapon is examined. Misses are inferred from an // is when a melee weapon is examined. Misses are inferred from an
// empty HitEntities. // empty HitEntities.
// TODO: This needs fixing // TODO: This needs fixing
if (meleeUid == user)
{
AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
$"{ToPrettyString(user):actor} melee attacked (light) using their hands and missed");
}
else
{
AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
$"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed");
}
var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage); var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage);
RaiseLocalEvent(meleeUid, missEvent); RaiseLocalEvent(meleeUid, missEvent);
Audio.PlayPredicted(component.SwingSound, meleeUid, user); Audio.PlayPredicted(component.SwingSound, meleeUid, user);
@@ -634,13 +644,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (meleeUid == user) if (meleeUid == user)
{ {
AdminLogger.Add(LogType.MeleeHit, AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using their hands and dealt {damageResult.Total:damage} damage"); $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(ev.Target.Value):subject} using their hands and dealt {damageResult.Total:damage} damage");
} }
else else
{ {
AdminLogger.Add(LogType.MeleeHit, AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage"); $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(ev.Target.Value):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.Total:damage} damage");
} }
PlayHitSound(ev.Target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound); PlayHitSound(ev.Target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound);
@@ -689,6 +699,16 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (entities.Count == 0) if (entities.Count == 0)
{ {
if (meleeUid == user)
{
AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
$"{ToPrettyString(user):actor} melee attacked (heavy) using their hands and missed");
}
else
{
AdminLogger.Add(LogType.MeleeHit, LogImpact.Low,
$"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed");
}
var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage); var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage);
RaiseLocalEvent(meleeUid, missEvent); RaiseLocalEvent(meleeUid, missEvent);
@@ -764,13 +784,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (meleeUid == user) if (meleeUid == user)
{ {
AdminLogger.Add(LogType.MeleeHit, AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using their hands and dealt {damageResult.Total:damage} damage"); $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using their hands and dealt {damageResult.Total:damage} damage");
} }
else else
{ {
AdminLogger.Add(LogType.MeleeHit, AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage"); $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.Total:damage} damage");
} }
} }
} }