From e3fbc1f122b0ff0891e9fa9d7712fe867202ee45 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Tue, 12 Dec 2023 00:06:54 +0300 Subject: [PATCH] Some Scp914 changes (#2290) --- Exiled.API/Features/Scp914.cs | 6 ++++++ .../EventArgs/Scp914/UpgradingInventoryItemEventArgs.cs | 9 ++++----- .../EventArgs/Scp914/UpgradingPickupEventArgs.cs | 9 ++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Exiled.API/Features/Scp914.cs b/Exiled.API/Features/Scp914.cs index e5d394b222..93ef42e37f 100644 --- a/Exiled.API/Features/Scp914.cs +++ b/Exiled.API/Features/Scp914.cs @@ -10,6 +10,7 @@ namespace Exiled.API.Features using System.Collections.Generic; using System.Linq; + using Exiled.API.Features.Doors; using Exiled.API.Features.Pickups; using Exiled.API.Features.Pools; using global::Scp914; @@ -88,6 +89,11 @@ public static Scp914Mode ConfigMode /// public static Transform OutputBooth => Scp914Controller.OutputChamber; + /// + /// Gets the list with which SCP-914 has. + /// + public static IReadOnlyCollection Doors => Scp914Controller._doors.Select(Door.Get).ToList(); + /// /// Filters all GameObjects inside SCP-914's intake chamber into players and items. /// diff --git a/Exiled.Events/EventArgs/Scp914/UpgradingInventoryItemEventArgs.cs b/Exiled.Events/EventArgs/Scp914/UpgradingInventoryItemEventArgs.cs index 4ee0a913da..8dd471a7fd 100644 --- a/Exiled.Events/EventArgs/Scp914/UpgradingInventoryItemEventArgs.cs +++ b/Exiled.Events/EventArgs/Scp914/UpgradingInventoryItemEventArgs.cs @@ -7,13 +7,12 @@ namespace Exiled.Events.EventArgs.Scp914 { + using System; + using API.Features; using API.Features.Items; - using global::Scp914; - using Interfaces; - using InventorySystem.Items; /// @@ -38,7 +37,6 @@ public class UpgradingInventoryItemEventArgs : IPlayerEvent, IItemEvent, IDeniab /// public UpgradingInventoryItemEventArgs(Player player, ItemBase item, Scp914KnobSetting knobSetting, bool isAllowed = true) { - Scp914 = API.Features.Scp914.Scp914Controller; Player = player; Item = Item.Get(item); KnobSetting = knobSetting; @@ -48,7 +46,8 @@ public UpgradingInventoryItemEventArgs(Player player, ItemBase item, Scp914KnobS /// /// Gets the instance. /// - public Scp914Controller Scp914 { get; } + [Obsolete("Use Scp914::Scp914Controller instead.")] + public Scp914Controller Scp914 => API.Features.Scp914.Scp914Controller; /// /// Gets or sets SCP-914 working knob setting. diff --git a/Exiled.Events/EventArgs/Scp914/UpgradingPickupEventArgs.cs b/Exiled.Events/EventArgs/Scp914/UpgradingPickupEventArgs.cs index 73a845197e..22744d5885 100644 --- a/Exiled.Events/EventArgs/Scp914/UpgradingPickupEventArgs.cs +++ b/Exiled.Events/EventArgs/Scp914/UpgradingPickupEventArgs.cs @@ -7,13 +7,12 @@ namespace Exiled.Events.EventArgs.Scp914 { + using System; + using Exiled.API.Features.Pickups; using Exiled.Events.EventArgs.Interfaces; - using global::Scp914; - using InventorySystem.Items.Pickups; - using UnityEngine; /// @@ -35,7 +34,6 @@ public class UpgradingPickupEventArgs : IPickupEvent, IDeniableEvent /// public UpgradingPickupEventArgs(ItemPickupBase item, Vector3 newPos, Scp914KnobSetting knobSetting) { - Scp914 = API.Features.Scp914.Scp914Controller; Pickup = Pickup.Get(item); OutputPosition = newPos; KnobSetting = knobSetting; @@ -49,7 +47,8 @@ public UpgradingPickupEventArgs(ItemPickupBase item, Vector3 newPos, Scp914KnobS /// /// Gets the instance. /// - public Scp914Controller Scp914 { get; } + [Obsolete("Use Scp914::Scp914Controller instead.")] + public Scp914Controller Scp914 => API.Features.Scp914.Scp914Controller; /// /// Gets or sets the position the item will be output to.