From dc3987d2763518f5259c944c7da2af0fc5b1cd69 Mon Sep 17 00:00:00 2001 From: Vretu-Dev Date: Sun, 29 Mar 2026 16:30:42 +0200 Subject: [PATCH] ShowingHitMarkerEventArgs --- .../Player/ShowingHitMarkerEventArgs.cs | 66 +++++++++++++++ EXILED/Exiled.Events/Handlers/Player.cs | 11 +++ .../Patches/Events/Player/ShowingHitMarker.cs | 81 +++++++++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs create mode 100644 EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs diff --git a/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs new file mode 100644 index 000000000..b72cf3c4c --- /dev/null +++ b/EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs @@ -0,0 +1,66 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) ExMod Team. All rights reserved. +// Licensed under the CC BY-SA 3.0 license. +// +// ----------------------------------------------------------------------- + +namespace Exiled.Events.EventArgs.Player +{ + using API.Features; + using Interfaces; + + /// + /// Contains all information before a hitmarker is show to player. + /// + public class ShowingHitMarkerEventArgs : IPlayerEvent, IDeniableEvent + { + /// + /// Initializes a new instance of the class. + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAudio, HitmarkerType hitmarkerType) + { + Player = Player.Get(hub); + Size = size; + ShouldPlayAudio = shouldPlayAudio; + HitmarkerType = hitmarkerType; + } + + /// + /// Gets or sets the player that the hitmarker is being shown to. + /// + public Player Player { get; set; } + + /// + /// Gets or sets the target size multiplier. + /// + public float Size { get; set; } + + /// + /// Gets or sets a value indicating whether the hitmarker sound effect should play. + /// + public bool ShouldPlayAudio { get; set; } + + /// + /// Gets or sets a the type of the hitmarker. + /// + public HitmarkerType HitmarkerType { get; set; } + + /// + /// Gets or sets a value indicating whether the hitmarker should be shown. + /// + public bool IsAllowed { get; set; } = true; + } +} \ No newline at end of file diff --git a/EXILED/Exiled.Events/Handlers/Player.cs b/EXILED/Exiled.Events/Handlers/Player.cs index c03bcebeb..34f5fb104 100644 --- a/EXILED/Exiled.Events/Handlers/Player.cs +++ b/EXILED/Exiled.Events/Handlers/Player.cs @@ -32,6 +32,11 @@ public class Player /// public static Event Hit { get; set; } = new (); + /// + /// Invoked before a player is shown a hitmarker. + /// + public static Event ShowingHitMarker { get; set; } = new (); + /// /// Invoked before authenticating a . /// @@ -1423,6 +1428,12 @@ public static void OnItemRemoved(ReferenceHub referenceHub, InventorySystem.Item /// The instance. public static void OnHit(HitEventArgs ev) => Hit.InvokeSafely(ev); + /// + /// Called before a player is shown a hitmarker. + /// + /// The instance. + public static void OnShowingHitMarker(ShowingHitMarkerEventArgs ev) => ShowingHitMarker.InvokeSafely(ev); + /// /// Called before Emergency Release Button is pressed. /// diff --git a/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs b/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs new file mode 100644 index 000000000..5eef6831d --- /dev/null +++ b/EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs @@ -0,0 +1,81 @@ +// ----------------------------------------------------------------------- +// +// Copyright (c) ExMod Team. All rights reserved. +// Licensed under the CC BY-SA 3.0 license. +// +// ----------------------------------------------------------------------- + +namespace Exiled.Events.Patches.Events.Player +{ + using System.Collections.Generic; + using System.Reflection.Emit; + + using Exiled.API.Features.Pools; + using Exiled.Events.Attributes; + using Exiled.Events.EventArgs.Player; + using HarmonyLib; + + using static HarmonyLib.AccessTools; + + /// + /// Patch the method. + /// Adds the event. + /// + [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.ShowingHitMarker))] + [HarmonyPatch(typeof(Hitmarker), nameof(Hitmarker.SendHitmarkerDirectly), typeof(ReferenceHub), typeof(float), typeof(bool), typeof(HitmarkerType))] + internal static class ShowingHitMarker + { + private static IEnumerable Transpiler(IEnumerable instructions, ILGenerator generator) + { + List newInstructions = ListPool.Pool.Get(instructions); + + LocalBuilder ev = generator.DeclareLocal(typeof(ShowingHitMarkerEventArgs)); + Label continueLabel = generator.DefineLabel(); + + int offset = 1; + + int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset; + + newInstructions.InsertRange(index, new[] + { + // ShowingHitMarkerEventArgs ev = new(hub, size, playAudio, hitmarkerType) + new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]), + new(OpCodes.Ldarg_1), + new(OpCodes.Ldarg_2), + new(OpCodes.Ldarg_3), + new(OpCodes.Newobj, GetDeclaredConstructors(typeof(ShowingHitMarkerEventArgs))[0]), + new(OpCodes.Dup), + new(OpCodes.Stloc_S, ev.LocalIndex), + + // Handlers.Player.OnShowingHitMarker(ev) + new(OpCodes.Call, Method(typeof(Handlers.Player), nameof(Handlers.Player.OnShowingHitMarker))), + + // if (!ev.IsAllowed) return; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.IsAllowed))), + new(OpCodes.Brtrue_S, continueLabel), + new(OpCodes.Ret), + + // size = ev.Size; + new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex).WithLabels(continueLabel), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.Size))), + new(OpCodes.Starg_S, 1), + + // playAudio = ev.ShouldPlayAudio; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.ShouldPlayAudio))), + new(OpCodes.Starg_S, 2), + + // hitmarkerType = ev.HitmarkerType; + new(OpCodes.Ldloc_S, ev.LocalIndex), + new(OpCodes.Callvirt, PropertyGetter(typeof(ShowingHitMarkerEventArgs), nameof(ShowingHitMarkerEventArgs.HitmarkerType))), + new(OpCodes.Starg_S, 3), + }); + + for (int z = 0; z < newInstructions.Count; z++) + yield return newInstructions[z]; + + ListPool.Pool.Return(newInstructions); + } + } +}