From 5c19277f7025ea10851b4cb41585b44f40583b3b Mon Sep 17 00:00:00 2001 From: Francesco Date: Tue, 17 Jan 2023 14:15:35 +0100 Subject: [PATCH] 5.1.3 --- SCPUtils/Commands/SwapRequest.cs | 14 +++++++------- SCPUtils/Commands/SwapRequestAccept.cs | 2 +- SCPUtils/Configs.cs | 2 +- SCPUtils/Functions/EventHandlers.cs | 11 ++++++++--- SCPUtils/Plugin.cs | 2 +- SCPUtils/SCPUtils.csproj | 22 +++++++++++----------- SCPUtils/packages.config | 2 +- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/SCPUtils/Commands/SwapRequest.cs b/SCPUtils/Commands/SwapRequest.cs index 4a82ea8..4cf8425 100644 --- a/SCPUtils/Commands/SwapRequest.cs +++ b/SCPUtils/Commands/SwapRequest.cs @@ -65,10 +65,10 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s case "SCP939": case "939": - target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp939); + target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp939); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; @@ -80,7 +80,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp049); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; @@ -92,7 +92,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp0492); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; @@ -104,7 +104,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp106); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; @@ -116,7 +116,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp096); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; @@ -140,7 +140,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s target = Eplayer.List.FirstOrDefault(x => x.Role.Type == PlayerRoles.RoleTypeId.Scp173); if (target == null) { - response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; + response = $"{arguments.Array[1].ToString().ToUpper() } didn't spawned!"; return false; } break; diff --git a/SCPUtils/Commands/SwapRequestAccept.cs b/SCPUtils/Commands/SwapRequestAccept.cs index 8876208..1c86f1a 100644 --- a/SCPUtils/Commands/SwapRequestAccept.cs +++ b/SCPUtils/Commands/SwapRequestAccept.cs @@ -52,7 +52,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s return false; } - if(!target.IsScp) + if (!target.IsScp) { response = $"Target is not an SCP"; return false; diff --git a/SCPUtils/Configs.cs b/SCPUtils/Configs.cs index 6666f21..70eb58a 100644 --- a/SCPUtils/Configs.cs +++ b/SCPUtils/Configs.cs @@ -341,7 +341,7 @@ public class Configs : IConfig { DamageTypes.Firearm.ToString().ToUpper(), DamageTypes.Firearm.ToString().ToUpper() }, { DamageTypes.FriendlyFireDetector.ToString().ToUpper(), DamageTypes.FriendlyFireDetector.ToString().ToUpper() }, { DamageTypes.Fsp9.ToString().ToUpper(), DamageTypes.Fsp9.ToString().ToUpper() }, { DamageTypes.Hypothermia.ToString().ToUpper(), DamageTypes.Hypothermia.ToString().ToUpper() }, { DamageTypes.Logicer.ToString().ToUpper(), DamageTypes.Logicer.ToString().ToUpper() }, { DamageTypes.MicroHid.ToString().ToUpper(), DamageTypes.MicroHid.ToString().ToUpper() }, { DamageTypes.ParticleDisruptor.ToString().ToUpper(), DamageTypes.ParticleDisruptor.ToString().ToUpper() }, { DamageTypes.PocketDimension.ToString().ToUpper(), DamageTypes.PocketDimension.ToString().ToUpper() }, { DamageTypes.Poison.ToString().ToUpper(), DamageTypes.Poison.ToString().ToUpper() }, { DamageTypes.Recontainment.ToString().ToUpper(), DamageTypes.Recontainment.ToString().ToUpper() }, { DamageTypes.Scp.ToString().ToUpper(), DamageTypes.Scp.ToString().ToUpper() }, { DamageTypes.Scp018.ToString().ToUpper(), DamageTypes.Scp018.ToString().ToUpper() }, { DamageTypes.Scp049.ToString().ToUpper(), DamageTypes.Scp049.ToString().ToUpper() }, { DamageTypes.Scp0492.ToString().ToUpper(), DamageTypes.Scp0492.ToString().ToUpper() }, { DamageTypes.Scp096.ToString().ToUpper(), DamageTypes.Scp096.ToString().ToUpper() }, { DamageTypes.Scp106.ToString().ToUpper(), DamageTypes.Scp106.ToString().ToUpper() }, - { DamageTypes.Scp173.ToString().ToUpper(), DamageTypes.Scp173.ToString().ToUpper() }, { DamageTypes.Scp207.ToString().ToUpper(), DamageTypes.Scp207.ToString().ToUpper() }, { DamageTypes.Scp939.ToString().ToUpper(), DamageTypes.Scp939.ToString().ToUpper() }, { DamageTypes.Scp956.ToString().ToUpper(), DamageTypes.Scp956.ToString().ToUpper() }, { DamageTypes.SeveredHands.ToString().ToUpper(), DamageTypes.SeveredHands.ToString().ToUpper() }, + { DamageTypes.Scp173.ToString().ToUpper(), DamageTypes.Scp173.ToString().ToUpper() }, { DamageTypes.Scp207.ToString().ToUpper(), DamageTypes.Scp207.ToString().ToUpper() }, { DamageTypes.Scp939.ToString().ToUpper(), DamageTypes.Scp939.ToString().ToUpper() }, { DamageTypes.SeveredHands.ToString().ToUpper(), DamageTypes.SeveredHands.ToString().ToUpper() }, { DamageTypes.Shotgun.ToString().ToUpper(), DamageTypes.Shotgun.ToString().ToUpper() }, { DamageTypes.Tesla.ToString().ToUpper(), DamageTypes.Tesla.ToString().ToUpper() }, { DamageTypes.Unknown.ToString().ToUpper(), DamageTypes.Unknown.ToString().ToUpper() }, { DamageTypes.Warhead.ToString().ToUpper(), DamageTypes.Warhead.ToString().ToUpper() }}; [Description("The command name for the unwarn command")] diff --git a/SCPUtils/Functions/EventHandlers.cs b/SCPUtils/Functions/EventHandlers.cs index 7186a80..b5d1fe1 100644 --- a/SCPUtils/Functions/EventHandlers.cs +++ b/SCPUtils/Functions/EventHandlers.cs @@ -94,21 +94,26 @@ internal void OnPlayerDeath(DyingEventArgs ev) else if (!ev.DamageHandler.IsSuicide) { - if (pluginInstance.Config.ScpSuicideMessage.Show) + + if (ev.Attacker == null) { - if (ev.Attacker == null) + if (pluginInstance.Config.ScpSuicideMessage.Show) { var message = pluginInstance.Config.ScpSuicideMessage.Content; message = message.Replace("%playername%", ev.Player.Nickname).Replace("%scpname%", ev.Player.Role.Type.ToString()).Replace("%reason%", ev.DamageHandler.Type.ToString()); Map.Broadcast(pluginInstance.Config.ScpSuicideMessage.Duration, message, pluginInstance.Config.ScpSuicideMessage.Type); } - else + } + else + { + if (pluginInstance.Config.ScpDeathMessage.Show) { var message = pluginInstance.Config.ScpDeathMessage.Content; message = message.Replace("%playername%", ev.Player.Nickname).Replace("%scpname%", ev.Player.Role.Type.ToString()).Replace("%killername%", ev.Attacker.Nickname).Replace("%reason%", ev.DamageHandler.Type.ToString()); Map.Broadcast(pluginInstance.Config.ScpDeathMessage.Duration, message, pluginInstance.Config.ScpDeathMessage.Type); } } + } } } diff --git a/SCPUtils/Plugin.cs b/SCPUtils/Plugin.cs index fb768f5..85f3bd2 100644 --- a/SCPUtils/Plugin.cs +++ b/SCPUtils/Plugin.cs @@ -13,7 +13,7 @@ public class ScpUtils : Features.Plugin { public override string Author { get; } = "Terminator_97#0507"; public override string Name { get; } = "SCPUtils"; - public override Version Version { get; } = new Version(5, 1, 2); + public override Version Version { get; } = new Version(5, 1, 3); public override Version RequiredExiledVersion { get; } = new Version(6, 0, 0); public EventHandlers EventHandlers { get; private set; } public Functions Functions { get; private set; } diff --git a/SCPUtils/SCPUtils.csproj b/SCPUtils/SCPUtils.csproj index 7edaac8..0d27496 100644 --- a/SCPUtils/SCPUtils.csproj +++ b/SCPUtils/SCPUtils.csproj @@ -46,31 +46,31 @@ G:\SteamLibrary\steamapps\common\SCP Secret Laboratory Dedicated Server\SCPSL_Data\Managed\Assembly-CSharp-Publicized.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\CommandSystem.Core.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\CommandSystem.Core.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.API.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.API.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.CreditTags.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.CreditTags.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.CustomItems.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.CustomItems.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.CustomRoles.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.CustomRoles.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.Events.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.Events.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.Loader.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.Loader.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.Permissions.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.Permissions.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\Exiled.Updater.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\Exiled.Updater.dll ..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll @@ -83,10 +83,10 @@ ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\NorthwoodLib.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\NorthwoodLib.dll - ..\packages\EXILED.6.0.0-beta.21\lib\net48\PluginAPI.dll + ..\packages\EXILED.6.0.0-beta.24\lib\net48\PluginAPI.dll diff --git a/SCPUtils/packages.config b/SCPUtils/packages.config index 663589d..6e79863 100644 --- a/SCPUtils/packages.config +++ b/SCPUtils/packages.config @@ -1,6 +1,6 @@  - +