diff --git a/DeathLog/LogHandler.cs b/DeathLog/LogHandler.cs index f33be61..338ab61 100644 --- a/DeathLog/LogHandler.cs +++ b/DeathLog/LogHandler.cs @@ -54,11 +54,12 @@ public static class LogHandler { var footprint = handler.Attacker; var attackerRole = footprint.Role; var canBeKos = !kosPermitted && IsKos(victimRole, attackerRole); + var scpAttacker = PlayerRoleLoader.TryGetRoleTemplate(attackerRole, out FpcStandardScp _); Log(sizeScalar => "KILL LOG".Bold().Color("yellow") + "#" + string.Format( - GetKillMessage(handler, canBeKos, hasWeaponEquipped, isCuffed, carriesWeapon, PlayerRoleLoader.TryGetRoleTemplate(attackerRole, out FpcStandardScp _), sizeScalar), + GetKillMessage(handler, canBeKos, hasWeaponEquipped, isCuffed, carriesWeapon, scpAttacker, sizeScalar), GetKillerStatus(attacker, sizeScalar), GetVictimStatus(victim, sizeScalar) - ), !isCuffed && (!canBeKos || hasWeaponEquipped), permissions, defaultScalar); + ), (scpAttacker || !isCuffed) && (!canBeKos || hasWeaponEquipped), permissions, defaultScalar); } private static bool IsKos(RoleTypeId victimRole, RoleTypeId attackerRole) => @@ -99,7 +100,7 @@ public static class LogHandler { private static string GetKillMessage(AttackerDamageHandler handler, bool canBeKos, bool hasWeaponEquipped, bool cuffed, bool carriesWeapon, bool scpAttacker, float sizeScalar) => (canBeKos && !hasWeaponEquipped ? "POSSIBLE KOS".Color("red").Size(50.Scale(sizeScalar)) + " " : "") - + (cuffed ? "DETAINED KILL ".Color(Cyan).Size(50.Scale(sizeScalar)) + " " : "") + + (cuffed && !scpAttacker ? "DETAINED KILL".Color(Cyan).Size(50.Scale(sizeScalar)) + " " : "") + handler switch { RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}", FirearmDamageHandler firearm => GetFirearmKillLog(firearm, sizeScalar),