diff --git a/DeathLog/DeathLog.csproj b/DeathLog/DeathLog.csproj index 03e0e49..6098da8 100644 --- a/DeathLog/DeathLog.csproj +++ b/DeathLog/DeathLog.csproj @@ -38,16 +38,16 @@ - ..\..\assemblies\Assembly-CSharp.dll + $(NW-ASSEMBLIES)\Assembly-CSharp.dll - ..\..\assemblies\Assembly-CSharp-firstpass.dll + $(NW-ASSEMBLIES)\Assembly-CSharp-firstpass.dll - ..\..\assemblies\Axwabo.Helpers.dll + $(NW-ASSEMBLIES)\Axwabo.Helpers.dll - ..\..\..\pluginz\assemblies\CommandSystem.Core.dll + $(NW-ASSEMBLIES)\CommandSystem.Core.dll ..\packages\Microsoft.CodeAnalysis.Common.3.3.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll @@ -56,17 +56,17 @@ ..\packages\Microsoft.CodeAnalysis.CSharp.3.3.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll - ..\..\assemblies\Mirror.dll + $(NW-ASSEMBLIES)\Mirror.dll - ..\..\assemblies\Mirror.Components.dll + $(NW-ASSEMBLIES)\Mirror.Components.dll - - ..\packages\Northwood.PluginAPI.Analyzers.12.0.0\lib\netstandard2.0\NwPluginAPI.Analyzers.dll + + $(NW-ASSEMBLIES)\PluginAPI.dll - - ..\packages\Northwood.PluginAPI.12.0.0\lib\net48\PluginAPI.dll + + $(NW-ASSEMBLIES)\Pooling.dll @@ -98,10 +98,10 @@ - ..\..\assemblies\UnityEngine.dll + $(NW-ASSEMBLIES)\UnityEngine.dll - ..\..\assemblies\UnityEngine.CoreModule.dll + $(NW-ASSEMBLIES)\UnityEngine.CoreModule.dll ..\packages\YamlDotNet.11.0.1\lib\net45\YamlDotNet.dll diff --git a/DeathLog/DeathLogPlugin.cs b/DeathLog/DeathLogPlugin.cs index e92569c..17aba49 100644 --- a/DeathLog/DeathLogPlugin.cs +++ b/DeathLog/DeathLogPlugin.cs @@ -5,7 +5,7 @@ using PlayerStatsSystem; using PluginAPI.Core; using PluginAPI.Core.Attributes; using PluginAPI.Enums; -using Respawning; +using PluginAPI.Events; namespace DeathLog; @@ -39,7 +39,7 @@ public sealed class DeathLogPlugin } [PluginEvent(ServerEventType.TeamRespawn)] - private void OnTeamRespawn(SpawnableTeamType team) => _spawnWaveOccurred = Config.IgnoreLeavingAfterSpawnWave; + private void OnTeamRespawn(TeamRespawnEvent e) => _spawnWaveOccurred = Config.IgnoreLeavingAfterSpawnWave; private static bool IsUnknownCause(DamageHandlerBase handler) => handler is UniversalDamageHandler udh && (udh.TranslationId == 0 ? string.IsNullOrEmpty(udh._logsText) : udh._logsText == DeathTranslations.Unknown.LogLabel); diff --git a/DeathLog/LogHandler.cs b/DeathLog/LogHandler.cs index d9a1c8a..cc2dda6 100644 --- a/DeathLog/LogHandler.cs +++ b/DeathLog/LogHandler.cs @@ -113,10 +113,10 @@ public static class LogHandler { RecontainmentDamageHandler => $"{{0}} {"recontained".Bold().Color(Lime).Size(35.Scale(sizeScalar))} {{1}}", FirearmDamageHandler firearm => GetFirearmKillLog(firearm, sizeScalar), - 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.Scale(sizeScalar))}", 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.Scale(sizeScalar))}", + ScpDamageHandler => $"{{0}} killed {{1}} using the {"default SCP attack".Bold().Color(Lime).Size(35.Scale(sizeScalar))}", 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.Scale(sizeScalar))} {{1}}", Scp018DamageHandler => $"{{0}} killed {{1}} with {"SCP-018".Bold().Color(Lime).Size(35.Scale(sizeScalar))}", diff --git a/DeathLog/packages.config b/DeathLog/packages.config index 60294bc..c9255c3 100644 --- a/DeathLog/packages.config +++ b/DeathLog/packages.config @@ -4,8 +4,6 @@ developmentDependency="true"/> - -