kpgdevelopers/DeathLog
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

biggest fix of all time

Browse Source
This commit is contained in:
Axwabo 2023-03-04 21:20:02 +01:00
parent 35c19bfa38
commit db884621a9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DeathLog/LogHandler.cs
View File

@ -54,11 +54,12 @@ public static class LogHandler {
var footprint = handler.Attacker; var footprint = handler.Attacker;
var attackerRole = footprint.Role; var attackerRole = footprint.Role;
var canBeKos = !kosPermitted && IsKos(victimRole, attackerRole); var canBeKos = !kosPermitted && IsKos(victimRole, attackerRole);
var scpAttacker = PlayerRoleLoader.TryGetRoleTemplate(attackerRole, out FpcStandardScp _);
Log(sizeScalar => "KILL LOG".Bold().Color("yellow") + "#" + string.Format( 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), GetKillerStatus(attacker, sizeScalar),
GetVictimStatus(victim, sizeScalar) GetVictimStatus(victim, sizeScalar)
), !isCuffed && (!canBeKos || hasWeaponEquipped), permissions, defaultScalar); ), (scpAttacker || !isCuffed) && (!canBeKos || hasWeaponEquipped), permissions, defaultScalar);
} }
private static bool IsKos(RoleTypeId victimRole, RoleTypeId attackerRole) => 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) => 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)) + " " : "") (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 { + handler switch {
RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}", RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}",
FirearmDamageHandler firearm => GetFirearmKillLog(firearm, sizeScalar), FirearmDamageHandler firearm => GetFirearmKillLog(firearm, sizeScalar),