Clarify stripping logs (#25190)

* Indicate whether pickpocketing is stealthy in logs, change :user to :actor, and clean up messages.

* Remove ugly whitespace

* Do the thing I should have done but didn't because I didn't want to think

* Fix spacing
This commit is contained in:
nikthechampiongr
2024-02-15 21:36:43 +02:00
committed by GitHub
parent d6502cd71b
commit 82f5bf8121

View File

@@ -238,7 +238,8 @@ namespace Content.Server.Strip
_popup.PopupEntity(message, target, target, PopupType.Large); _popup.PopupEntity(message, target, target, PopupType.Large);
} }
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot"); var prefix = ev.Stealth ? "stealthily " : "";
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
var result = await _doAfter.WaitDoAfter(doAfterArgs); var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) if (result != DoAfterStatus.Finished)
@@ -250,7 +251,7 @@ namespace Content.Server.Strip
{ {
_inventorySystem.TryEquip(user, target, held, slot); _inventorySystem.TryEquip(user, target, held, slot);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot"); _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
} }
} }
@@ -305,14 +306,15 @@ namespace Content.Server.Strip
DuplicateCondition = DuplicateConditions.SameTool DuplicateCondition = DuplicateConditions.SameTool
}; };
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands"); var prefix = ev.Stealth ? "stealthily " : "";
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
var result = await _doAfter.WaitDoAfter(doAfterArgs); var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) return; if (result != DoAfterStatus.Finished) return;
_handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands); _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
_handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands); _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands"); _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
// hand update will trigger strippable update // hand update will trigger strippable update
} }
@@ -381,7 +383,8 @@ namespace Content.Server.Strip
} }
} }
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}"); var prefix = ev.Stealth ? "stealthily " : "";
_adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
var result = await _doAfter.WaitDoAfter(doAfterArgs); var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) if (result != DoAfterStatus.Finished)
@@ -394,7 +397,7 @@ namespace Content.Server.Strip
RaiseLocalEvent(item, new DroppedEvent(user), true); RaiseLocalEvent(item, new DroppedEvent(user), true);
_handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth); _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth);
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}"); _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
} }
@@ -453,8 +456,9 @@ namespace Content.Server.Strip
strippable.Owner); strippable.Owner);
} }
var prefix = ev.Stealth ? "stealthily " : "";
_adminLogger.Add(LogType.Stripping, LogImpact.Low, _adminLogger.Add(LogType.Stripping, LogImpact.Low,
$"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}"); $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
var result = await _doAfter.WaitDoAfter(doAfterArgs); var result = await _doAfter.WaitDoAfter(doAfterArgs);
if (result != DoAfterStatus.Finished) if (result != DoAfterStatus.Finished)
@@ -464,7 +468,7 @@ namespace Content.Server.Strip
_handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands); _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands);
// hand update will trigger strippable update // hand update will trigger strippable update
_adminLogger.Add(LogType.Stripping, LogImpact.Medium, _adminLogger.Add(LogType.Stripping, LogImpact.Medium,
$"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}"); $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
} }
} }
} }