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

kos option + font size scalar

Browse Source
This commit is contained in:
Axwabo 2023-02-23 20:03:46 +01:00
parent 9c67403aa8
commit 58c39b0775
5 changed files with 102 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DeathLog/DeathLogConfig.cs
View File

@ -8,4 +8,8 @@ public sealed class DeathLogConfig {
public bool LogLeavingScpPlayers { get; set; } = true; public bool LogLeavingScpPlayers { get; set; } = true;
public bool KillOnSightPermitted { get; set; } = false;
public float DefaultFontSizeScalar { get; set; } = 1;
} }

8
DeathLog/DeathLogPlugin.cs
View File

@ -10,7 +10,7 @@ namespace DeathLog;
public sealed class DeathLogPlugin { public sealed class DeathLogPlugin {
[PluginEntryPoint("DeathLog", "1.0.0", "DeathLog", "Axwabo")] [PluginEntryPoint("DeathLog", "1.1.0", "DeathLog", "Axwabo")]
public void OnEnabled() { public void OnEnabled() {
PluginAPI.Events.EventManager.RegisterEvents(this); PluginAPI.Events.EventManager.RegisterEvents(this);
Log.Info("DeathLog loaded!"); Log.Info("DeathLog loaded!");
@ -42,9 +42,9 @@ public sealed class DeathLogPlugin {
[PluginEvent(ServerEventType.PlayerDying)] [PluginEvent(ServerEventType.PlayerDying)]
private void OnPlayerDeath(Player player, Player attacker, DamageHandlerBase handler) { private void OnPlayerDeath(Player player, Player attacker, DamageHandlerBase handler) {
if (attacker != null && handler is AttackerDamageHandler adh) if (attacker != null && handler is AttackerDamageHandler adh)
LogHandler.LogAttackerDeathMessage(player, attacker, adh, Config.VisibilityRequirement); LogHandler.LogAttackerDeathMessage(player, attacker, adh, Config.VisibilityRequirement, Config.KillOnSightPermitted, Config.DefaultFontSizeScalar);
else if (Config.LogSimpleDeaths) else if (Config.LogSimpleDeaths)
LogHandler.LogSimpleDeathMessage(player, handler, Config.VisibilityRequirement); LogHandler.LogSimpleDeathMessage(player, handler, Config.VisibilityRequirement, Config.DefaultFontSizeScalar);
if (!IsUnknownCause(handler) || player.ReferenceHub.roleManager.CurrentRole is not FpcStandardScp scp) if (!IsUnknownCause(handler) || player.ReferenceHub.roleManager.CurrentRole is not FpcStandardScp scp)
return; return;
_lastRole = scp.RoleName.Color(scp.RoleColor.ToHex()); _lastRole = scp.RoleName.Color(scp.RoleColor.ToHex());
@ -68,7 +68,7 @@ public sealed class DeathLogPlugin {
[PluginEvent(ServerEventType.PlayerLeft)] [PluginEvent(ServerEventType.PlayerLeft)]
private void OnPlayerLeave(Player player) { private void OnPlayerLeave(Player player) {
if (!_spawnWaveOccurred && Config.LogLeavingScpPlayers && player.UserId == _lastId) if (!_spawnWaveOccurred && Config.LogLeavingScpPlayers && player.UserId == _lastId)
LogHandler.LogLeavingScp(_lastRole, _lastHealth, _lastHumeShield, Config.VisibilityRequirement); LogHandler.LogLeavingScp(_lastRole, _lastHealth, _lastHumeShield, Config.VisibilityRequirement, Config.DefaultFontSizeScalar);
} }
} }

125
DeathLog/LogHandler.cs
View File

@ -1,4 +1,5 @@
using System.Linq; using System;
using System.Linq;
using Axwabo.Helpers; using Axwabo.Helpers;
using PlayerRoles; using PlayerRoles;
using PlayerRoles.PlayableScps; using PlayerRoles.PlayableScps;
@ -32,19 +33,19 @@ public static class LogHandler {
or ItemType.SCP018 or ItemType.SCP018
or ItemType.MicroHID; or ItemType.MicroHID;
public static void LogSimpleDeathMessage(Player player, DamageHandlerBase handler, PlayerPermissions permissions) => Log("DEATH LOG" + "#" + string.Format( public static void LogSimpleDeathMessage(Player player, DamageHandlerBase handler, PlayerPermissions permissions, float defaultScalar) => Log(sizeScalar => "DEATH LOG" + "#" + string.Format(
GetDeathMessage(handler), GetDeathMessage(handler, sizeScalar),
GetVictimStatus(player) GetVictimStatus(player, sizeScalar)
), true, permissions); ), true, permissions, defaultScalar);
private static string GetDeathMessage(DamageHandlerBase handler) => handler switch { private static string GetDeathMessage(DamageHandlerBase handler, float sizeScalar) => handler switch {
CustomReasonDamageHandler custom => $"{{0}} has died: {custom._deathReason.Bold().Color(Lime).Size(30)}", CustomReasonDamageHandler custom => $"{{0}} has died: {custom._deathReason.Bold().Color(Lime).Size(30.Scale(sizeScalar))}",
UniversalDamageHandler universal => $"{{0}} has died. Reason: {universal._logsText.TrimEnd('.').Bold().Color(Lime).Size(30)}", UniversalDamageHandler universal => $"{{0}} has died. Reason: {universal._logsText.TrimEnd('.').Bold().Color(Lime).Size(30.Scale(sizeScalar))}",
WarheadDamageHandler => $"{{0}} died to {"the Alpha Warhead".Bold().Color(Lime).Size(30)}", WarheadDamageHandler => $"{{0}} died to {"the Alpha Warhead".Bold().Color(Lime).Size(30.Scale(sizeScalar))}",
_ => $"{{0}} has died. {"Reason is unknown".Italic().Color(Lime)}" _ => $"{{0}} has died. {"Reason is unknown".Italic().Color(Lime)}"
}; };
public static void LogAttackerDeathMessage(Player victim, Player attacker, AttackerDamageHandler handler, PlayerPermissions permissions) { public static void LogAttackerDeathMessage(Player victim, Player attacker, AttackerDamageHandler handler, PlayerPermissions permissions, bool kosPermitted, float defaultScalar) {
var isCuffed = victim.IsDisarmed; var isCuffed = victim.IsDisarmed;
var inv = victim.ReferenceHub.inventory; var inv = victim.ReferenceHub.inventory;
var hasWeaponEquipped = IsWeapon(inv.CurItem.TypeId); var hasWeaponEquipped = IsWeapon(inv.CurItem.TypeId);
@ -52,70 +53,82 @@ public static class LogHandler {
var victimRole = victim.Role; var victimRole = victim.Role;
var footprint = handler.Attacker; var footprint = handler.Attacker;
var attackerRole = footprint.Role; var attackerRole = footprint.Role;
var canBeKos = victimRole == RoleTypeId.ClassD && attackerRole == RoleTypeId.Scientist var canBeKos = !kosPermitted && IsKos(victimRole, attackerRole);
|| victimRole == RoleTypeId.Scientist && attackerRole == RoleTypeId.ClassD Log(sizeScalar => "KILL LOG".Bold().Color("yellow") + "#" + string.Format(
|| victimRole == RoleTypeId.ClassD && attackerRole is RoleTypeId.FacilityGuard or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfCaptain; GetKillMessage(handler, canBeKos, hasWeaponEquipped, isCuffed, carriesWeapon, PlayerRoleLoader.TryGetRoleTemplate(attackerRole, out FpcStandardScp _), sizeScalar),
Log("KILL LOG".Bold().Color("yellow") + "#" + string.Format( GetKillerStatus(attacker, sizeScalar),
GetKillMessage(handler, canBeKos, hasWeaponEquipped, isCuffed, carriesWeapon, PlayerRoleLoader.TryGetRoleTemplate(attackerRole, out FpcStandardScp _)), GetVictimStatus(victim, sizeScalar)
GetKillerStatus(attacker), ), !isCuffed && (!canBeKos || hasWeaponEquipped), permissions, defaultScalar);
GetVictimStatus(victim)
), !isCuffed && (!canBeKos || hasWeaponEquipped), permissions);
} }
private static void Log(string msg, bool success, PlayerPermissions playerPermissions) { private static bool IsKos(RoleTypeId victimRole, RoleTypeId attackerRole) =>
victimRole == RoleTypeId.ClassD && attackerRole == RoleTypeId.Scientist
|| victimRole == RoleTypeId.Scientist && attackerRole == RoleTypeId.ClassD
|| victimRole == RoleTypeId.ClassD && attackerRole is RoleTypeId.FacilityGuard or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfCaptain;
private static void Log(Func<float, string> msg, bool success, PlayerPermissions playerPermissions, float defaultScalar) {
foreach (var p in Player.GetPlayers()) { foreach (var p in Player.GetPlayers()) {
var sender = p.ReferenceHub.queryProcessor._sender; var sender = p.ReferenceHub.queryProcessor._sender;
if (p.RemoteAdminAccess && PermissionsHandler.IsPermitted(sender.Permissions, playerPermissions) && !ToggleLogsCommand.HiddenIdList.Contains(sender.SenderId)) if (!p.RemoteAdminAccess || !PermissionsHandler.IsPermitted(sender.Permissions, playerPermissions) || ToggleLogsCommand.HiddenIdList.Contains(sender.SenderId))
sender.RaReply(msg, success, true, ""); continue;
var scalar = ToggleLogsCommand.SizeScalar.TryGetValue(sender.SenderId, out var sizeScalar) ? sizeScalar : defaultScalar;
sender.RaReply(msg(scalar), success, true, "");
} }
} }
private static string GetIdWithDnt(Player player) { private static string GetIdWithDnt(Player player, float sizeScalar) {
var dnt = player.DoNotTrack; var dnt = player.DoNotTrack;
return $"{(dnt ? "(DNT)".Color(DntColor).Size(50) + " " : "")}{player.UserId.Color(Color.magenta)} {player.PlayerId.ToString().Bold().Color("yellow").Size(30)}"; return $"{(dnt ? "(DNT)".Color(DntColor).Size(50.Scale(sizeScalar)) + " " : "")}{player.UserId.Color(Color.magenta)} {player.PlayerId.ToString().Bold().Color("yellow").Size(30.Scale(sizeScalar))}";
} }
private static object GetKillerStatus(Player attacker) { private static object GetKillerStatus(Player attacker, float sizeScalar) {
var role = attacker.Rm().CurrentRole; var role = attacker.Rm().CurrentRole;
return GetIdWithDnt(attacker) return GetIdWithDnt(attacker, sizeScalar)
+ " " + " "
+ role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35) + role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35.Scale(sizeScalar))
+ " " + attacker.Nickname.Bold().Size(35); + " " + attacker.Nickname.Bold().Size(35.Scale(sizeScalar));
} }
private static object GetVictimStatus(Player victim) { private static object GetVictimStatus(Player victim, float sizeScalar) {
var role = victim.Rm().CurrentRole; var role = victim.Rm().CurrentRole;
return GetIdWithDnt(victim).Size(25) return GetIdWithDnt(victim, sizeScalar).Size(25.Scale(sizeScalar))
+ " " + " "
+ role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35) + role.RoleName.Color(role.RoleColor.ToHex(true, false)).Size(35.Scale(sizeScalar))
+ " " + victim.Nickname.Bold().Size(30); + " " + victim.Nickname.Bold().Size(30.Scale(sizeScalar));
} }
private static string GetKillMessage(AttackerDamageHandler handler, bool canBeKos, bool hasWeaponEquipped, bool cuffed, bool carriesWeapon, bool scpAttacker) => 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) + " " : "") (canBeKos && !hasWeaponEquipped ? "POSSIBLE KOS".Color("red").Size(50.Scale(sizeScalar)) + " " : "")
+ (cuffed ? "DETAINED KILL ".Color(Cyan).Size(50) + " " : "") + (cuffed ? "DETAINED KILL ".Color(Cyan).Size(50.Scale(sizeScalar)) + " " : "")
+ handler switch { + handler switch {
RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35)} {{1}}", RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}",
FirearmDamageHandler firearm => GetFirearmKillLog(firearm), FirearmDamageHandler firearm => GetFirearmKillLog(firearm, sizeScalar),
ScpDamageHandler => $"{{0}} killed {{1}} using the {"default SCP attack".Bold().Color(Lime).Size(35)}", ScpDamageHandler => $"{{0}} killed {{1}} using the {"default SCP attack".Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
Scp096DamageHandler scp096 => $"{{0}} killed {{1}} using {GetScp096AttackType(scp096).Bold().Color(Lime).Size(35)}", Scp096DamageHandler scp096 => $"{{0}} killed {{1}} using {GetScp096AttackType(scp096).Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
Scp049DamageHandler scp049 => $"{{0}} killed {{1}} using {GetScp049AttackType(scp049).Bold().Color(Lime).Size(35)}", Scp049DamageHandler scp049 => $"{{0}} killed {{1}} using {GetScp049AttackType(scp049).Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
Scp939DamageHandler scp939 => $"{{0}} killed {{1}} using {GetScp939AttackType(scp939).Bold().Color(Lime).Size(35)}", Scp939DamageHandler scp939 => $"{{0}} killed {{1}} using {GetScp939AttackType(scp939).Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
MicroHidDamageHandler => $"{{0}} fried {{1}} with the {"Micro H.I.D.".Bold().Color(Lime).Size(35)}", MicroHidDamageHandler => $"{{0}} fried {{1}} with the {"Micro H.I.D.".Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
ExplosionDamageHandler => $"{{0}} {"exploded".Bold().Color(Lime).Size(35)} {{1}}", ExplosionDamageHandler => $"{{0}} {"exploded".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}",
Scp018DamageHandler => $"{{0}} killed {{1}} with {"SCP-018".Bold().Color(Lime).Size(35)}", Scp018DamageHandler => $"{{0}} killed {{1}} with {"SCP-018".Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
DisruptorDamageHandler => $"{{0}} killed {{1}} with the {"3-X Particle Disruptor".Bold().Color(Lime).Size(35)}", DisruptorDamageHandler => $"{{0}} killed {{1}} with the {"3-X Particle Disruptor".Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
JailbirdDamageHandler => $"{{0}} killed {{1}} with the {"Jailbird".Bold().Color(Lime).Size(35)}", JailbirdDamageHandler => $"{{0}} killed {{1}} with the {"Jailbird".Bold().Color(Lime).Size(35.Scale(sizeScalar))}",
_ => $"{{0}} killed {{1}}. {"Reason is unknown".Italic().Color(Lime)}" _ => $"{{0}} killed {{1}}. {"Reason is unknown".Italic().Color(Lime)}"
} }
+ WeaponStatusMessage(!scpAttacker, hasWeaponEquipped, carriesWeapon); + WeaponStatusMessage(!scpAttacker, hasWeaponEquipped, carriesWeapon, sizeScalar);
private static string WeaponStatusMessage(bool show, bool hasWeaponEquipped, bool carriesWeapon) => show && (carriesWeapon || hasWeaponEquipped) ? (hasWeaponEquipped ? " Victim was " + "holding".Underline() + " a weapon." : " Victim was " + "carrying".Underline() + " a weapon.").Color(Cyan).Size(30) : ""; private static string WeaponStatusMessage(bool show, bool hasWeaponEquipped, bool carriesWeapon, float sizeScalar) =>
show && (carriesWeapon || hasWeaponEquipped)
? (hasWeaponEquipped
? " Victim was " + "holding".Underline() + " a weapon."
: " Victim was " + "carrying".Underline() + " a weapon."
).Color(Cyan).Size(30.Scale(sizeScalar))
: "";
private static string GetFirearmKillLog(FirearmDamageHandler firearm) => $"{{0}} shot {{1}} with {firearm.WeaponType.ToString().Bold().Color("red").Size(35)} to the hitbox " + firearm.Hitbox.ToString().Color("red").Bold().Size(35); private static string GetFirearmKillLog(FirearmDamageHandler firearm, float sizeScalar) =>
$"{{0}} shot {{1}} with {firearm.WeaponType.ToString().Bold().Color("red").Size(35.Scale(sizeScalar))} to the hitbox " + firearm.Hitbox.ToString().Color("red").Bold().Size(35.Scale(sizeScalar));
private static string GetScp096AttackType(Scp096DamageHandler scp096) => scp096._attackType switch { private static string GetScp096AttackType(Scp096DamageHandler scp096) => scp096._attackType switch {
Scp096DamageHandler.AttackType.Charge => "Charge", Scp096DamageHandler.AttackType.Charge => nameof(Scp096DamageHandler.AttackType.Charge),
Scp096DamageHandler.AttackType.SlapLeft => "Left Slap", Scp096DamageHandler.AttackType.SlapLeft => "Left Slap",
Scp096DamageHandler.AttackType.SlapRight => "Right Slap", Scp096DamageHandler.AttackType.SlapRight => "Right Slap",
Scp096DamageHandler.AttackType.GateKill => "Gate Kill", Scp096DamageHandler.AttackType.GateKill => "Gate Kill",
@ -123,22 +136,24 @@ public static class LogHandler {
}; };
private static string GetScp049AttackType(Scp049DamageHandler scp049) => scp049.DamageSubType switch { private static string GetScp049AttackType(Scp049DamageHandler scp049) => scp049.DamageSubType switch {
Scp049DamageHandler.AttackType.Instakill => "Instakill", Scp049DamageHandler.AttackType.Instakill => nameof(Scp049DamageHandler.AttackType.Instakill),
Scp049DamageHandler.AttackType.Scp0492 => "SCP-049-2", Scp049DamageHandler.AttackType.Scp0492 => "SCP-049-2",
Scp049DamageHandler.AttackType.CardiacArrest => "Cardiac Arrest", Scp049DamageHandler.AttackType.CardiacArrest => "Cardiac Arrest",
_ => "[an unknown attack type]" _ => "[an unknown attack type]"
}; };
private static string GetScp939AttackType(Scp939DamageHandler scp939) => scp939._damageType switch { private static string GetScp939AttackType(Scp939DamageHandler scp939) => scp939._damageType switch {
Scp939DamageType.Claw => "Claw", Scp939DamageType.Claw => nameof(Scp939DamageType.Claw),
Scp939DamageType.LungeSecondary => "Lunge Secondary", Scp939DamageType.LungeSecondary => "Lunge Secondary",
Scp939DamageType.LungeTarget => "Lunge Target", Scp939DamageType.LungeTarget => "Lunge Target",
_ => "[an unknown attack type]" _ => "[an unknown attack type]"
}; };
public static void LogLeavingScp(string role, float health, float hs, PlayerPermissions permissions) => public static void LogLeavingScp(string role, float health, float hs, PlayerPermissions permissions, float defaultScalar) =>
Log($"{"SCP Left".Color("red").Bold()}#Please replace {role.Size(40)} as the player has left the game.\n" + Log(sizeScalar => $"{"SCP Left".Color("red").Bold()}#Please replace {role.Size(40.Scale(sizeScalar))} as the player has left the game.\n" +
($"HP: {((int) health).ToString().Color("red")} " + ($"HP: {((int) health).ToString().Color("red")} " +
$"HS: {((int) hs).ToString().Color("purple")}").Size(35), false, permissions); $"HS: {((int) hs).ToString().Color("purple")}").Size(35.Scale(sizeScalar)), false, permissions, defaultScalar);
private static int Scale(this int number, float scalar) => (int) (number * scalar);
} }

6
DeathLog/Properties/AssemblyInfo.cs
View File

@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DeathLog")] [assembly: AssemblyProduct("DeathLog")]
[assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.1.0.0")]

26
DeathLog/ToggleLogsCommand.cs
View File

@ -9,10 +9,11 @@ namespace DeathLog;
public sealed class ToggleLogsCommand : ICommand { public sealed class ToggleLogsCommand : ICommand {
public static readonly HashSet<string> HiddenIdList = new(); public static readonly HashSet<string> HiddenIdList = new();
public static readonly Dictionary<string, float> SizeScalar = new();
public string Command => "toggleKillLogs"; public string Command => "toggleKillLogs";
public string[] Aliases { get; } = {"tkl"}; public string[] Aliases { get; } = {"tkl"};
public string Description => "Toggles the visibility of kill logs for the caller."; public string Description => "Toggles the visibility of kill logs or changes the font size scalar for the caller.";
public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response) { public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response) {
if (sender is not PlayerCommandSender {ReferenceHub.characterClassManager.UserId: var id}) { if (sender is not PlayerCommandSender {ReferenceHub.characterClassManager.UserId: var id}) {
@ -32,18 +33,33 @@ public sealed class ToggleLogsCommand : ICommand {
} }
switch (arguments.At(0).ToLower()) { switch (arguments.At(0).ToLower()) {
case "on" or "enable" or "true" or "1": case "on" or "enable" or "true" or "yes":
HiddenIdList.Remove(id); HiddenIdList.Remove(id);
response = "You will now see kill logs."; response = "You will now see kill logs.";
return true; return true;
case "off" or "disable" or "false" or "0": case "off" or "disable" or "false" or "no":
HiddenIdList.Add(id); HiddenIdList.Add(id);
response = "You will no longer see kill logs."; response = "You will no longer see kill logs.";
return true; return true;
default: default:
response = "Invalid argument."; return ParseScalar(arguments, id, out response);
return false;
} }
} }
private static bool ParseScalar(ArraySegment<string> arguments, string id, out string response) {
if (!float.TryParse(arguments.At(0), out var scalar)) {
response = "Invalid argument. Expected a float or a boolean.";
return false;
}
if (scalar is not (> 0 and <= 5)) {
response = "Invalid argument. Expected a float in range 0-5.";
return false;
}
SizeScalar[id] = scalar;
response = $"Your kill log font size scalar is now {scalar}.";
return true;
}
} }