Merge branch 'dev' of https://github.com/ExMod-Team/EXILED into ExMod-dev

Author: louis1706

.gitignore

@@ -376,4 +376,7 @@ _site/
 JSON/
 
 # Mac DS_Store
-.DS_Store
+.DS_Store
+
+# Code Rush
+/EXILED/.cr/*

EXILED/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) == ''">9.6.1</Version>
+    <Version Condition="$(Version) == ''">9.7.1</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

EXILED/Exiled.API/Enums/AspectRatioType.cs

@@ -0,0 +1,60 @@
+// -----------------------------------------------------------------------
+// <copyright file="AspectRatioType.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Enums
+{
+    /// <summary>
+    /// All available screen aspect ratio types.
+    /// </summary>
+    public enum AspectRatioType : byte
+    {
+        /// <summary>
+        /// Unknown aspect ratio.
+        /// </summary>
+        Unknown,
+
+        /// <summary>
+        /// 1:1 aspect ratio (square screen).
+        /// </summary>
+        Ratio1_1,
+
+        /// <summary>
+        /// 3:2 aspect ratio.
+        /// </summary>
+        Ratio3_2,
+
+        /// <summary>
+        /// 4:3 aspect ratio (standard definition TVs, older monitors).
+        /// </summary>
+        Ratio4_3,
+
+        /// <summary>
+        /// 5:4 aspect ratio (some older computer monitors).
+        /// </summary>
+        Ratio5_4,
+
+        /// <summary>
+        /// 16:9 aspect ratio (modern widescreen displays, HDTV).
+        /// </summary>
+        Ratio16_9,
+
+        /// <summary>
+        /// 16:10 aspect ratio (common in productivity monitors and laptops).
+        /// </summary>
+        Ratio16_10,
+
+        /// <summary>
+        /// 21:9 aspect ratio (ultrawide displays).
+        /// </summary>
+        Ratio21_9,
+
+        /// <summary>
+        /// 32:9 aspect ratio (super ultrawide displays).
+        /// </summary>
+        Ratio32_9,
+    }
+}

EXILED/Exiled.API/Enums/DamageType.cs

@@ -15,8 +15,7 @@ namespace Exiled.API.Enums
     /// Identifiers for types of damage.
     /// </summary>
     /// <seealso cref="Player.Hurt(float, DamageType, string)"/>
-    /// <seealso cref="Player.Hurt(Player, float, DamageType, Features.DamageHandlers.DamageHandlerBase.CassieAnnouncement)"/>
-    /// <seealso cref="Player.Hurt(Player, float, DamageType, Features.DamageHandlers.DamageHandlerBase.CassieAnnouncement, string)"/>
+    /// <seealso cref="Player.Hurt(Player, float, DamageType, Features.DamageHandlers.DamageHandlerBase.CassieAnnouncement, string, bool)"/>
     /// <seealso cref="Player.Kill(DamageType, string)"/>
     public enum DamageType
     {
@@ -275,4 +274,4 @@ public enum DamageType
         /// </summary>
         Scp127,
     }
-}
+}

EXILED/Exiled.API/Enums/EffectType.cs

@@ -288,5 +288,25 @@ public enum EffectType
         /// <see cref="CustomPlayerEffects.Scp1344Detected"/>.
         /// </summary>
         Scp1344Detected,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.Scp1576"/>.
+        /// </summary>
+        Scp1576,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.Lightweight"/>.
+        /// </summary>
+        Lightweight,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.HeavyFooted"/>.
+        /// </summary>
+        HeavyFooted,
+
+        /// <summary>
+        /// <see cref="CustomPlayerEffects.Fade"/>.
+        /// </summary>
+        Fade,
     }
 }

EXILED/Exiled.API/Enums/PrefabType.cs

@@ -372,5 +372,14 @@ public enum PrefabType
 
         [Prefab(162530276, "TextToy")]
         TextToy,
+
+        [Prefab(4046276968, "Spawnable Unsecured Pryable GateDoor")]
+        SpawnableUnsecuredPryableGateDoor,
+
+        [Prefab(2332883846, "CullableParentToy")]
+        CullableParentToy,
+
+        [Prefab(3938583646, "WaypointToy")]
+        WaypointToy,
     }
 }

EXILED/Exiled.API/Enums/SpawnReason.cs

@@ -57,6 +57,11 @@ public enum SpawnReason : byte // TOTO: Remove this file and use Basegame
         /// </summary>
         Destroyed,
 
+        /// <summary>
+        /// The player was dead and is respawning in a mini-wave.
+        /// </summary>
+        RespawnMiniwave,
+
         /// <summary>
         /// The user has been spawn by the usage of an Item.
         /// </summary>

EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs

@@ -124,12 +124,12 @@ public static class DamageTypeExtensions
         /// Check if a <see cref="DamageType">damage type</see> is caused by a weapon.
         /// </summary>
         /// <param name="type">The damage type to be checked.</param>
-        /// <param name="checkMicro">Indicates whether the MicroHid damage type should be taken into account.</param>
+        /// <param name="checkNonFirearm">Indicates whether the MicroHid and Jailbird damage type should be taken into account.</param>
         /// <returns>Returns whether the <see cref="DamageType"/> is caused by weapon.</returns>
-        public static bool IsWeapon(this DamageType type, bool checkMicro = true) => type switch
+        public static bool IsWeapon(this DamageType type, bool checkNonFirearm = true) => type switch
         {
             DamageType.Crossvec or DamageType.Logicer or DamageType.Revolver or DamageType.Shotgun or DamageType.AK or DamageType.Com15 or DamageType.Com18 or DamageType.E11Sr or DamageType.Fsp9 or DamageType.ParticleDisruptor or DamageType.Com45 or DamageType.Frmg0 or DamageType.A7 => true,
-            DamageType.MicroHid when checkMicro => true,
+            DamageType.MicroHid or DamageType.Jailbird when checkNonFirearm => true,
             _ => false,
         };
 

EXILED/Exiled.API/Extensions/EffectTypeExtension.cs

@@ -76,6 +76,10 @@ public static class EffectTypeExtension
             { EffectType.PitDeath, typeof(PitDeath) },
             { EffectType.Blurred, typeof(Blurred) },
             { EffectType.Scp1344Detected, typeof(Scp1344Detected) },
+            { EffectType.Scp1576, typeof(Scp1576) },
+            { EffectType.Lightweight, typeof(Lightweight) },
+            { EffectType.HeavyFooted, typeof(HeavyFooted) },
+            { EffectType.Fade, typeof(Fade) },
             #pragma warning disable CS0618
             { EffectType.Marshmallow, typeof(MarshmallowEffect) },
             { EffectType.BecomingFlamingo, typeof(BecomingFlamingo) },

EXILED/Exiled.API/Extensions/FloatExtensions.cs

@@ -0,0 +1,56 @@
+// -----------------------------------------------------------------------
+// <copyright file="FloatExtensions.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.API.Extensions
+{
+    using System;
+    using System.Collections.Generic;
+
+    using Exiled.API.Enums;
+
+    /// <summary>
+    /// A set of extensions for <see cref="float"/>.
+    /// </summary>
+    public static class FloatExtensions
+    {
+        private static readonly Dictionary<AspectRatioType, float> AspectRatioReferences = new()
+        {
+            { AspectRatioType.Unknown, 0f },
+            { AspectRatioType.Ratio1_1, 1f },
+            { AspectRatioType.Ratio3_2, 3f / 2f },
+            { AspectRatioType.Ratio4_3, 4f / 3f },
+            { AspectRatioType.Ratio5_4, 5f / 4f },
+            { AspectRatioType.Ratio16_9, 16f / 9f },
+            { AspectRatioType.Ratio16_10, 16f / 10f },
+            { AspectRatioType.Ratio21_9, 21f / 9f },
+            { AspectRatioType.Ratio32_9, 32f / 9f },
+        };
+
+        /// <summary>
+        /// Gets the closest <see cref="AspectRatioType"/> for a given aspect ratio value.
+        /// </summary>
+        /// <param name="ratio">The aspect ratio value to compare.</param>
+        /// <returns>The closest matching <see cref="AspectRatioType"/>.</returns>
+        public static AspectRatioType GetAspectRatioLabel(this float ratio)
+        {
+            float closestDiff = float.MaxValue;
+            AspectRatioType closestRatio = AspectRatioType.Unknown;
+
+            foreach (KeyValuePair<AspectRatioType, float> kvp in AspectRatioReferences)
+            {
+                float diff = Math.Abs(ratio - kvp.Value);
+                if (diff < closestDiff)
+                {
+                    closestDiff = diff;
+                    closestRatio = kvp.Key;
+                }
+            }
+
+            return closestRatio;
+        }
+    }
+}