Merge dev to master

EXILED.props

@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">8.4.3</Version>
+    <Version Condition="$(Version) == ''">8.7.1</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

Exiled.API/Enums/EffectType.cs

@@ -14,9 +14,15 @@ namespace Exiled.API.Enums
     /// <summary>
     /// Status effects as enum.
     /// </summary>
-    /// <seealso cref="EffectTypeExtension.Type(EffectType)"/>
+    /// <seealso cref="EffectTypeExtension.TryGetEffectType(CustomPlayerEffects.StatusEffectBase, out EffectType)"/>
+    /// <seealso cref="EffectTypeExtension.TryGetType(EffectType, out Type)"/>
     public enum EffectType
     {
+        /// <summary>
+        /// This EffectType do not exist it's only use when not found or error.
+        /// </summary>
+        None = -1, // TODO: remove = -1
+
         /// <summary>
         /// The player isn't able to open their inventory or reload a weapon.
         /// </summary>

Exiled.API/Enums/Side.cs

@@ -26,7 +26,7 @@ public enum Side
         /// <summary>
         /// SCP team. Same as <see cref="Team.SCPs"/>.
         /// Contains all SCP-related roles: <see cref="RoleTypeId.Scp049"/>, <see cref="RoleTypeId.Scp0492"/>, <see cref="RoleTypeId.Scp079"/>, <see cref="RoleTypeId.Scp096"/>,
-        /// <see cref="RoleTypeId.Scp106"/>, <see cref="RoleTypeId.Scp173"/>, and <see cref="RoleTypeId.Scp939"/>.
+        /// <see cref="RoleTypeId.Scp106"/>, <see cref="RoleTypeId.Scp173"/>, <see cref="RoleTypeId.Scp939"/>, and <see cref="RoleTypeId.Scp3114"/>.
         /// </summary>
         Scp,
 

Exiled.API/Extensions/CommonExtensions.cs

@@ -42,7 +42,7 @@ public static class CommonExtensions
         /// <returns>The new modfied curve.</returns>
         public static AnimationCurve Multiply(this AnimationCurve curve, float amount)
         {
-            for (var i = 0; i < curve.length; i++)
+            for (int i = 0; i < curve.length; i++)
                 curve.keys[i].value *= amount;
 
             return curve;
@@ -56,7 +56,7 @@ public static AnimationCurve Multiply(this AnimationCurve curve, float amount)
         /// <returns>The new modfied curve.</returns>
         public static AnimationCurve Add(this AnimationCurve curve, float amount)
         {
-            for (var i = 0; i < curve.length; i++)
+            for (int i = 0; i < curve.length; i++)
                 curve.keys[i].value += amount;
 
             return curve;

Exiled.API/Extensions/EffectTypeExtension.cs

@@ -85,6 +85,15 @@ public static class EffectTypeExtension
         public static Type Type(this EffectType effect)
             => EffectTypeToType.TryGetValue(effect, out Type type) ? type : throw new InvalidOperationException("Invalid effect enum provided");
 
+        /// <summary>
+        /// Gets an instance of <see cref="System.Type"/> points to an effect.
+        /// </summary>
+        /// <param name="effect">The <see cref="EffectType"/> enum.</param>
+        /// <param name="type">The type found with the corresponding EffecType.</param>
+        /// <returns>Whether or not the effectType has been found.</returns>
+        public static bool TryGetType(this EffectType effect, out Type type)
+            => EffectTypeToType.TryGetValue(effect, out type);
+
         /// <summary>
         /// Gets the <see cref="EffectType"/> of the specified <see cref="StatusEffectBase"/>.
         /// </summary>
@@ -93,6 +102,23 @@ public static Type Type(this EffectType effect)
         public static EffectType GetEffectType(this StatusEffectBase statusEffectBase)
             => TypeToEffectType.TryGetValue(statusEffectBase.GetType(), out EffectType effect) ? effect : throw new InvalidOperationException("Invalid effect status base provided");
 
+        /// <summary>
+        /// Gets the <see cref="EffectType"/> of the specified <see cref="StatusEffectBase"/>.
+        /// </summary>
+        /// <param name="statusEffectBase">The <see cref="StatusEffectBase"/> enum.</param>
+        /// <param name="effect">The effect found.</param>
+        /// <returns>Whether or not the effect has been found.</returns>
+        public static bool TryGetEffectType(this StatusEffectBase statusEffectBase, out EffectType effect)
+        {
+            if (statusEffectBase == null || !TypeToEffectType.TryGetValue(statusEffectBase.GetType(), out effect))
+            {
+                effect = EffectType.None;
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Returns whether or not the provided <paramref name="effect"/> drains health over time.
         /// </summary>
@@ -109,7 +135,7 @@ or EffectType.Corroding or EffectType.Decontaminating or EffectType.Hemorrhage o
         /// <param name="effect">The <see cref="EffectType"/>.</param>
         /// <returns>Whether or not the effect heals.</returns>
         /// <seealso cref="IsHarmful(EffectType)"/>
-        public static bool IsHealing(this EffectType effect) => typeof(IHealablePlayerEffect).IsAssignableFrom(effect.Type());
+        public static bool IsHealing(this EffectType effect) => effect.TryGetType(out Type type) && typeof(IHealablePlayerEffect).IsAssignableFrom(type);
 
         /// <summary>
         /// Returns whether or not the provided <paramref name="effect"/> is a negative effect.
@@ -137,14 +163,14 @@ or EffectType.Invigorated or EffectType.Invisible or EffectType.MovementBoost or
         /// </summary>
         /// <param name="effect">The <see cref="EffectType"/>.</param>
         /// <returns>Whether or not the effect modifies the player's movement speed.</returns>
-        public static bool IsMovement(this EffectType effect) => typeof(IMovementSpeedModifier).IsAssignableFrom(effect.Type());
+        public static bool IsMovement(this EffectType effect) => effect.TryGetType(out Type type) && typeof(IMovementSpeedModifier).IsAssignableFrom(type);
 
         /// <summary>
         /// Returns whether or not the provided <paramref name="effect"/> is displayed to spectators as text.
         /// </summary>
         /// <param name="effect">The <see cref="EffectType"/>.</param>
         /// <returns>Whether or not the effect is displayed to spectators as text.</returns>
-        public static bool IsDisplayed(this EffectType effect) => typeof(ISpectatorDataPlayerEffect).IsAssignableFrom(effect.Type());
+        public static bool IsDisplayed(this EffectType effect) => effect.TryGetType(out Type type) && typeof(ISpectatorDataPlayerEffect).IsAssignableFrom(type);
 
         /// <summary>
         /// Returns the <see cref="EffectCategory"/> of the given <paramref name="effect"/>.

Exiled.API/Extensions/ItemExtensions.cs

@@ -18,7 +18,7 @@ namespace Exiled.API.Extensions
     using InventorySystem;
     using InventorySystem.Items;
     using InventorySystem.Items.Firearms.Attachments;
-
+    using InventorySystem.Items.Pickups;
     using Structs;
 
     /// <summary>
@@ -96,6 +96,13 @@ public static ItemBase GetItemBase(this ItemType type)
             return itemBase;
         }
 
+        /// <summary>
+        /// Given an <see cref="ItemType"/>, returns the matching <see cref="ItemPickupBase"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="ItemType"/>.</param>
+        /// <returns>The <see cref="ItemPickupBase"/>, or <see langword="null"/> if not found.</returns>
+        public static ItemPickupBase GetPickupBase(this ItemType type) => GetItemBase(type)?.PickupDropModel;
+
         /// <summary>
         /// Given an <see cref="ItemType"/>, returns the matching <see cref="ItemBase"/>, casted to <typeparamref name="T"/>.
         /// </summary>

Exiled.API/Extensions/ReflectionExtensions.cs

@@ -40,10 +40,10 @@ public static void InvokeStaticMethod(this Type type, string methodName, object[
         /// <param name="param">The event arguments.</param>
         public static void InvokeStaticEvent(this Type type, string eventName, object[] param)
         {
-            var eventDelegate = (MulticastDelegate)type.GetField(eventName, AccessTools.all).GetValue(null);
+            MulticastDelegate eventDelegate = (MulticastDelegate)type.GetField(eventName, AccessTools.all).GetValue(null);
             if (eventDelegate != null)
             {
-                foreach (var handler in eventDelegate.GetInvocationList())
+                foreach (Delegate handler in eventDelegate.GetInvocationList())
                 {
                     handler.Method.Invoke(handler.Target, param);
                 }

Exiled.API/Features/DamageHandlers/AttackerDamageHandler.cs

@@ -99,7 +99,7 @@ public override void ProcessDamage(Player player)
 
             if ((player != Attacker) && !ForceFullFriendlyFire)
             {
-                if (HitboxIdentity.CheckFriendlyFire(AttackerFootprint.Role, player.Role, true))
+                if (HitboxIdentity.IsEnemy(AttackerFootprint.Role, player.Role))
                     return;
 
                 Damage *= PlayerStatsSystem.AttackerDamageHandler._ffMultiplier;

Exiled.API/Features/Doors/CheckpointDoor.cs

@@ -93,7 +93,7 @@ public float Health
             {
                 float health = value / Subdoors.Count;
 
-                foreach (var door in Subdoors)
+                foreach (BreakableDoor door in Subdoors)
                 {
                     door.Health = health;
                 }
@@ -108,7 +108,7 @@ public float MaxHealth
             {
                 float health = value / Subdoors.Count;
 
-                foreach (var door in Subdoors)
+                foreach (BreakableDoor door in Subdoors)
                 {
                     door.MaxHealth = health;
                 }
@@ -121,7 +121,7 @@ public DoorDamageType IgnoredDamage
             get => Subdoors.Aggregate(DoorDamageType.None, (current, door) => current | door.IgnoredDamage);
             set
             {
-                foreach (var door in Subdoors)
+                foreach (BreakableDoor door in Subdoors)
                 {
                     door.IgnoredDamage = value;
                 }

Exiled.API/Features/Doors/Gate.cs

@@ -43,17 +43,17 @@ public Gate(PryableDoor door, List<Room> room)
         /// <summary>
         /// Gets a value indicating whether or not the door is fully closed.
         /// </summary>
-        public override bool IsFullyClosed => base.IsFullyClosed && RemainingPryCooldown > 0;
+        public override bool IsFullyClosed => base.IsFullyClosed && RemainingPryCooldown <= 0;
 
         /// <summary>
         /// Gets a value indicating whether the door is fully open.
         /// </summary>
-        public override bool IsFullyOpen => base.IsFullyOpen && RemainingPryCooldown <= 0;
+        public override bool IsFullyOpen => base.IsFullyOpen;
 
         /// <summary>
         /// Gets a value indicating whether or not the door is currently moving.
         /// </summary>
-        public override bool IsMoving => base.IsMoving && RemainingPryCooldown > 0;
+        public override bool IsMoving => base.IsMoving || RemainingPryCooldown > 0;
 
         /// <summary>
         /// Gets or sets remaining cooldown for prying.

Exiled.API/Features/Effect.cs

@@ -32,7 +32,9 @@ public Effect()
         /// <param name="statusEffectBase">Get all the information of the effect>.</param>
         public Effect(StatusEffectBase statusEffectBase)
         {
-            Type = statusEffectBase.GetEffectType();
+            if (!statusEffectBase.TryGetEffectType(out EffectType effect))
+                Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
+            Type = effect;
             Duration = statusEffectBase.Duration;
             Intensity = statusEffectBase.Intensity;
             IsEnabled = statusEffectBase.IsEnabled;

Exiled.API/Features/Generator.cs

@@ -116,7 +116,7 @@ public bool IsActivating
         public bool IsOpen
         {
             get => Base.HasFlag(Base.Network_flags, Scp079Generator.GeneratorFlags.Open);
-            set => Base.ServerSetFlag(Scp079Generator.GeneratorFlags.Unlocked, value);
+            set => Base.ServerSetFlag(Scp079Generator.GeneratorFlags.Open, value);
         }
 
         /// <summary>

Exiled.API/Features/Items/Item.cs

@@ -325,6 +325,19 @@ public virtual Pickup CreatePickup(Vector3 position, Quaternion rotation = defau
         /// <returns>A string containing Item-related data.</returns>
         public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* ={Owner}=";
 
+        /// <summary>
+        /// Changes the owner of the <see cref="Item"/>.
+        /// </summary>
+        /// <param name="oldOwner">Old <see cref="Item"/> owner.</param>
+        /// <param name="newOwner">New <see cref="Item"/> owner.</param>
+        public void ChangeItemOwner(Player oldOwner, Player newOwner)
+        {
+            if (oldOwner != null && newOwner != null)
+            {
+                ChangeOwner(oldOwner, newOwner);
+            }
+        }
+
         /// <summary>
         /// Change the owner of the <see cref="Item"/>.
         /// </summary>

Exiled.API/Features/Items/Scp244.cs

@@ -7,6 +7,7 @@
 
 namespace Exiled.API.Features.Items
 {
+    using Exiled.API.Extensions;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Interfaces;
 
@@ -29,6 +30,10 @@ public Scp244(Scp244Item itemBase)
             : base(itemBase)
         {
             Base = itemBase;
+            Scp244DeployablePickup scp244Pickup = (Scp244DeployablePickup)Type.GetPickupBase();
+            Health = scp244Pickup._health;
+            ActivationDot = scp244Pickup._activationDot;
+            MaxDiameter = scp244Pickup.MaxDiameter;
         }
 
         /// <summary>
@@ -54,6 +59,22 @@ public bool Primed
             set => Base._primed = value;
         }
 
+        /// <summary>
+        /// Gets or sets the Scp244's remaining health.
+        /// </summary>
+        public float Health { get; set; }
+
+        /// <summary>
+        /// Gets or sets the activation angle, where 1 is the minimum and -1 is the maximum activation angle.
+        /// </summary>
+        public float ActivationDot { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum diameter within which SCP-244's hypothermia effect is dealt.
+        /// </summary>
+        /// <remarks>This does not prevent visual effects.</remarks>
+        public float MaxDiameter { get; set; }
+
         /// <summary>
         /// Creates the <see cref="Pickup"/> that based on this <see cref="Item"/>.
         /// </summary>
@@ -86,12 +107,27 @@ public override Pickup CreatePickup(Vector3 position, Quaternion rotation = defa
         public override Item Clone() => new Scp244(Type)
         {
             Primed = Primed,
+            MaxDiameter = MaxDiameter,
+            Health = Health,
+            ActivationDot = ActivationDot,
         };
 
         /// <summary>
         /// Returns the SCP-244 in a human readable format.
         /// </summary>
         /// <returns>A string containing SCP-244 related data.</returns>
         public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* -{Primed}-";
+
+        /// <inheritdoc/>
+        internal override void ReadPickupInfo(Pickup pickup)
+        {
+            base.ReadPickupInfo(pickup);
+            if (pickup is Scp244Pickup scp244)
+            {
+                Health = scp244.Health;
+                ActivationDot = scp244.ActivationDot;
+                MaxDiameter = scp244.MaxDiameter;
+            }
+        }
     }
 }

Exiled.API/Features/Log.cs

@@ -156,8 +156,8 @@ public static void Send(string message, Discord.LogLevel level, ConsoleColor col
         /// Sends an <see cref="Error(object)"/> with the provided message if the condition is false and stops the execution.
         /// <example> For example:
         /// <code>
-        ///     Player ply = Player.Get(2);
-        ///     Log.Assert(ply is not null, "The player with the id 2 is null");
+        /// Player ply = Player.Get(2);
+        /// Log.Assert(ply is not null, "The player with the id 2 is null");
         /// </code>
         /// results in it logging an error if the player is null and not continuing.
         /// </example>

Exiled.API/Features/Pickups/Scp244Pickup.cs

@@ -10,8 +10,9 @@ namespace Exiled.API.Features.Pickups
     using System;
 
     using Exiled.API.Features.DamageHandlers;
+    using Exiled.API.Features.Items;
     using Exiled.API.Interfaces;
-
+    using InventorySystem.Items;
     using InventorySystem.Items.Usables.Scp244;
 
     using UnityEngine;
@@ -75,6 +76,16 @@ public float CurrentSizePercent
             set => Base.CurrentSizePercent = value;
         }
 
+        /// <summary>
+        /// Gets or sets the maximum diameter within which SCP-244's hypothermia effect is dealt.
+        /// </summary>
+        /// <remarks>This does not prevent visual effects.</remarks>
+        public float MaxDiameter
+        {
+            get => Base.MaxDiameter;
+            set => Base.MaxDiameter = value;
+        }
+
         /// <summary>
         /// Gets or sets the Scp244's remaining health.
         /// </summary>
@@ -124,5 +135,17 @@ public float ActivationDot
         /// </summary>
         /// <returns>A string containing Scp244Pickup related data.</returns>
         public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* |{Health}| -{State}- ={CurrentSizePercent}=";
+
+        /// <inheritdoc/>
+        internal override void ReadItemInfo(Item item)
+        {
+            base.ReadItemInfo(item);
+            if (item is Scp244 scp244)
+            {
+                ActivationDot = scp244.ActivationDot;
+                MaxDiameter = scp244.MaxDiameter;
+                Health = scp244.Health;
+            }
+        }
     }
 }