forked from Exiled-Official/EXILED
-
Notifications
You must be signed in to change notification settings - Fork 110
feat: ShowingHitMarkerEventArgs #791
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Vretu-Dev
wants to merge
2
commits into
ExMod-Team:master
Choose a base branch
from
Vretu-Dev:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
EXILED/Exiled.Events/EventArgs/Player/ShowingHitMarkerEventArgs.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // ----------------------------------------------------------------------- | ||
| // <copyright file="ShowingHitMarkerEventArgs.cs" company="ExMod Team"> | ||
| // Copyright (c) ExMod Team. All rights reserved. | ||
| // Licensed under the CC BY-SA 3.0 license. | ||
| // </copyright> | ||
| // ----------------------------------------------------------------------- | ||
|
|
||
| namespace Exiled.Events.EventArgs.Player | ||
| { | ||
| using API.Features; | ||
| using Interfaces; | ||
|
|
||
| /// <summary> | ||
| /// Contains all information before a hitmarker is show to player. | ||
| /// </summary> | ||
| public class ShowingHitMarkerEventArgs : IPlayerEvent, IDeniableEvent | ||
| { | ||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="ShowingHitMarkerEventArgs" /> class. | ||
| /// </summary> | ||
| /// <param name="hub"> | ||
| /// <inheritdoc cref="Player" /> | ||
| /// </param> | ||
| /// <param name="size"> | ||
| /// <inheritdoc cref="Size" /> | ||
| /// </param> | ||
| /// <param name="shouldPlayAudio"> | ||
| /// <inheritdoc cref="ShouldPlayAudio" /> | ||
| /// </param> | ||
| /// <param name="hitmarkerType"> | ||
| /// <inheritdoc cref="HitmarkerType" /> | ||
| /// </param> | ||
| public ShowingHitMarkerEventArgs(ReferenceHub hub, float size, bool shouldPlayAudio, HitmarkerType hitmarkerType) | ||
| { | ||
| Player = Player.Get(hub); | ||
| Size = size; | ||
| ShouldPlayAudio = shouldPlayAudio; | ||
| HitmarkerType = hitmarkerType; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets the player that the hitmarker is being shown to. | ||
| /// </summary> | ||
| public Player Player { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets the target size multiplier. | ||
| /// </summary> | ||
| public float Size { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets a value indicating whether the hitmarker sound effect should play. | ||
| /// </summary> | ||
| public bool ShouldPlayAudio { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets a the type of the hitmarker. | ||
| /// </summary> | ||
| public HitmarkerType HitmarkerType { get; set; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets a value indicating whether the hitmarker should be shown. | ||
| /// </summary> | ||
| public bool IsAllowed { get; set; } = true; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
EXILED/Exiled.Events/Patches/Events/Player/ShowingHitMarker.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // ----------------------------------------------------------------------- | ||
| // <copyright file="ShowingHitMarker.cs" company="ExMod Team"> | ||
| // Copyright (c) ExMod Team. All rights reserved. | ||
| // Licensed under the CC BY-SA 3.0 license. | ||
| // </copyright> | ||
| // ----------------------------------------------------------------------- | ||
|
|
||
| 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; | ||
|
|
||
| /// <summary> | ||
| /// Patch the <see cref="Hitmarker.SendHitmarkerDirectly(ReferenceHub, float, bool, HitmarkerType)"/> method. | ||
| /// Adds the <see cref="Handlers.Player.ShowingHitMarker"/> event. | ||
| /// </summary> | ||
| [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<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator) | ||
| { | ||
| List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.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<CodeInstruction>.Pool.Return(newInstructions); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The XML doc summary has grammatical errors ("is show to player"); please correct to something like "...before a hitmarker is shown to a player." so generated docs/readers are clear.