Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix InteractingScp330EventArgs::Candy #124

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix InteractingScp330EventArgs::Candy #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Features/Items/Scp330.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ internal Scp330()
/// </summary>
public CandyKindID ExposedType { get; set; } = CandyKindID.None;

/// <summary>
/// Gets or sets the candy that will be added to the bag. Used for events.
/// </summary>
internal CandyKindID CandyToAdd { get; set; } = CandyKindID.None;

/// <summary>
/// Adds a specific candy to the bag.
/// </summary>
Expand Down
23 changes: 18 additions & 5 deletions EXILED/Exiled.Events/EventArgs/Scp330/InteractingScp330EventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,23 @@ public class InteractingScp330EventArgs : IPlayerEvent, IScp330Event, IDeniableE
public InteractingScp330EventArgs(Player player, int usage)
{
Player = player;
Scp330 = Scp330Bag.TryGetBag(player.ReferenceHub, out Scp330Bag scp330Bag) ? (Scp330)Item.Get(scp330Bag) : null;
Candy = Scp330Candies.GetRandom();
UsageCount = usage;
ShouldSever = usage >= 2;
ShouldPlaySound = true;
IsAllowed = Player.IsHuman;

if (Scp330Bag.TryGetBag(player.ReferenceHub, out Scp330Bag scp330Bag))
{
Scp330 = (Scp330)Item.Get(scp330Bag);
}
VALERA771 marked this conversation as resolved.
Show resolved Hide resolved
else
{
Scp330 = (Scp330)Item.Create(ItemType.SCP330, player);
Scp330.RemoveAllCandy();
player.AddItem(Scp330);
}

Scp330.CandyToAdd = Scp330Candies.GetRandom();
}

/// <summary>
Expand All @@ -47,7 +58,11 @@ public InteractingScp330EventArgs(Player player, int usage)
/// <summary>
/// Gets or sets a value indicating the type of candy that will be received from this interaction.
/// </summary>
public CandyKindID Candy { get; set; }
public CandyKindID Candy
{
get => Scp330.CandyToAdd;
set => Scp330.CandyToAdd = value;
}

/// <summary>
/// Gets or sets a value indicating whether the player's hands should get severed.
Expand All @@ -71,11 +86,9 @@ public InteractingScp330EventArgs(Player player, int usage)
public Player Player { get; }

/// <inheritdoc/>
/// <remarks>This value can be null.</remarks>
public Scp330 Scp330 { get; }

/// <inheritdoc/>
/// <remarks>This value can be null.</remarks>
public Item Item => Scp330;
}
}
27 changes: 22 additions & 5 deletions EXILED/Exiled.Events/Patches/Events/Scp330/InteractingScp330.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@

namespace Exiled.Events.Patches.Events.Scp330
{
#pragma warning disable SA1402
#pragma warning disable SA1313
using System.Collections.Generic;
using System.Reflection.Emit;

using Exiled.API.Features;
using Exiled.API.Features.Items;
using Exiled.API.Features.Pools;
using Exiled.Events.Attributes;
using Exiled.Events.EventArgs.Scp330;
using Exiled.Events.Handlers;
using HarmonyLib;
using Interactables.Interobjects;
using InventorySystem.Items.Usables.Scp330;
Expand All @@ -26,9 +27,9 @@ namespace Exiled.Events.Patches.Events.Scp330

/// <summary>
/// Patches the <see cref="Scp330Interobject.ServerInteract(ReferenceHub, byte)" /> method to add the
/// <see cref="Scp330.InteractingScp330" /> event.
/// <see cref="Handlers.Scp330.InteractingScp330" /> event.
/// </summary>
[EventPatch(typeof(Scp330), nameof(Scp330.InteractingScp330))]
[EventPatch(typeof(Handlers.Scp330), nameof(Handlers.Scp330.InteractingScp330))]
[HarmonyPatch(typeof(Scp330Interobject), nameof(Scp330Interobject.ServerInteract))]
public static class InteractingScp330
{
Expand Down Expand Up @@ -66,7 +67,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
new(OpCodes.Stloc, ev.LocalIndex),

// Scp330.OnInteractingScp330(ev)
new(OpCodes.Call, Method(typeof(Scp330), nameof(Scp330.OnInteractingScp330))),
new(OpCodes.Call, Method(typeof(Handlers.Scp330), nameof(Handlers.Scp330.OnInteractingScp330))),

// if (!ev.IsAllowed)
// return;
Expand Down Expand Up @@ -135,4 +136,20 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
ListPool<CodeInstruction>.Pool.Return(newInstructions);
}
}

/// <summary>
/// Replaces <see cref="Scp330Candies.GetRandom"/> with <see cref="InteractingScp330EventArgs.Candy"/>.
/// </summary>
[EventPatch(typeof(Handlers.Scp330), nameof(Handlers.Scp330.InteractingScp330))]
[HarmonyPatch(typeof(Scp330Bag), nameof(Scp330Bag.TryAddSpecific))]
internal static class ReplaceCandy
{
private static void Prefix(Scp330Bag __instance, ref CandyKindID kind)
{
Scp330 scp330 = Item.Get<Scp330>(__instance);

if (scp330.CandyToAdd != CandyKindID.None)
kind = scp330.CandyToAdd;
}
}
}
Loading