Merge branch 'LabAPI' into doormoment

Author: VALERA771

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.0-beta7</Version>
+    <Version Condition="$(Version) == ''">9.6.0-beta8</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs

@@ -52,7 +52,7 @@ public override ItemType Type
         /// <summary>
         /// Gets or sets the weapon damage.
         /// </summary>
-        public virtual float Damage { get; set; } = float.NaN;
+        public virtual float Damage { get; set; } = -1;
 
         /// <summary>
         /// Gets or sets a value indicating how big of a clip the weapon will have.
@@ -205,7 +205,7 @@ protected virtual void OnShot(ShotEventArgs ev)
         /// <param name="ev"><see cref="HurtingEventArgs"/>.</param>
         protected virtual void OnHurting(HurtingEventArgs ev)
         {
-            if (ev.IsAllowed && Damage != float.NaN)
+            if (ev.IsAllowed && Damage >= 0)
                 ev.Amount = Damage;
         }
 

EXILED/Exiled.Events/EventArgs/Item/InspectedItemEventArgs.cs

@@ -0,0 +1,35 @@
+// -----------------------------------------------------------------------
+// <copyright file="InspectedItemEventArgs.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.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items;
+
+    /// <summary>
+    /// Contains all information before weapon is inspected.
+    /// </summary>
+    public class InspectedItemEventArgs : IItemEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InspectedItemEventArgs"/> class.
+        /// </summary>
+        /// <param name="item"><inheritdoc cref="Item"/></param>
+        public InspectedItemEventArgs(ItemBase item)
+        {
+            Item = Item.Get(item);
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Item.Owner;
+
+        /// <inheritdoc/>
+        public Item Item { get; }
+    }
+}

EXILED/Exiled.Events/EventArgs/Item/InspectingItemEventArgs.cs

@@ -0,0 +1,41 @@
+// -----------------------------------------------------------------------
+// <copyright file="InspectingItemEventArgs.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.Item
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Items;
+    using Exiled.Events.EventArgs.Interfaces;
+    using InventorySystem.Items;
+
+    /// <summary>
+    /// Contains all information before weapon is inspected.
+    /// </summary>
+    public class InspectingItemEventArgs : IItemEvent, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InspectingItemEventArgs"/> class.
+        /// </summary>
+        /// <param name="item"><inheritdoc cref="Item"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public InspectingItemEventArgs(ItemBase item, bool isAllowed = true)
+        {
+            Item = Item.Get(item);
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc/>
+        public Player Player => Item.Owner;
+
+        /// <inheritdoc/>
+        public Item Item { get; }
+
+        /// <inheritdoc/>
+        /// <remarks>Setter will not work if inspected <see cref="Item"/> is a <see cref="Firearm"/> or a <see cref="Keycard"/>.</remarks>
+        public bool IsAllowed { get; set; }
+    }
+}

EXILED/Exiled.Events/EventArgs/Player/EscapingPocketDimensionEventArgs.cs

@@ -24,16 +24,16 @@ public class EscapingPocketDimensionEventArgs : IPlayerEvent, IDeniableEvent
         /// <param name="pocketDimensionTeleport">
         /// <inheritdoc cref="Teleporter" />
         /// </param>
-        /// <param name="player">
+        /// <param name="hub">
         /// <inheritdoc cref="Player" />
         /// </param>
         /// <param name="position">
         /// <inheritdoc cref="TeleportPosition" />
         /// </param>
-        public EscapingPocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, Player player, Vector3 position)
+        public EscapingPocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, ReferenceHub hub, Vector3 position)
         {
             Teleporter = pocketDimensionTeleport;
-            Player = player;
+            Player = Player.Get(hub);
             TeleportPosition = position;
         }
 

EXILED/Exiled.Events/EventArgs/Scp939/PlacingMimicPointEventArgs.cs

@@ -0,0 +1,48 @@
+// -----------------------------------------------------------------------
+// <copyright file="PlacingMimicPointEventArgs.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.Scp939
+{
+    using Exiled.API.Features;
+    using Exiled.API.Features.Roles;
+    using Exiled.Events.EventArgs.Interfaces;
+    using RelativePositioning;
+
+    /// <summary>
+    /// Contains all information before mimicry point is placed.
+    /// </summary>
+    public class PlacingMimicPointEventArgs : IScp939Event, IDeniableEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlacingMimicPointEventArgs"/> class.
+        /// </summary>
+        /// <param name="player"><inheritdoc cref="Player"/></param>
+        /// <param name="position"><inheritdoc cref="Position"/></param>
+        /// <param name="isAllowed"><inheritdoc cref="IsAllowed"/></param>
+        public PlacingMimicPointEventArgs(Player player, RelativePosition position, bool isAllowed = true)
+        {
+            Player = player;
+            Scp939 = player.Role.As<Scp939Role>();
+            Position = position;
+            IsAllowed = isAllowed;
+        }
+
+        /// <inheritdoc/>
+        public Player Player { get; }
+
+        /// <inheritdoc/>
+        public Scp939Role Scp939 { get; }
+
+        /// <inheritdoc/>
+        public bool IsAllowed { get; set; }
+
+        /// <summary>
+        /// Gets or sets a position of mimicry point.
+        /// </summary>
+        public RelativePosition Position { get; set; }
+    }
+}

EXILED/Exiled.Events/Handlers/Item.cs

@@ -58,6 +58,16 @@ public static class Item
         /// </summary>
         public static Event<ChangingMicroHIDPickupStateEventArgs> ChangingMicroHIDPickupState { get; set; } = new();
 
+        /// <summary>
+        /// Invoked before item inspection is started.
+        /// </summary>
+        public static Event<InspectingItemEventArgs> InspectingItem { get; set; } = new();
+
+        /// <summary>
+        /// Invoked after item inspection is started.
+        /// </summary>
+        public static Event<InspectedItemEventArgs> InspectedItem { get; set; } = new();
+
         /// <summary>
         /// Invoked before a <see cref="ItemType.ParticleDisruptor"/> firing while on the ground.
         /// <remarks>The client will still see all effects, like sounds and shoot.</remarks>
@@ -118,5 +128,17 @@ public static class Item
         /// </summary>
         /// <param name="ev">The <see cref="ChangingMicroHIDPickupStateEventArgs"/> instance.</param>
         public static void OnChangingMicroHIDPickupState(ChangingMicroHIDPickupStateEventArgs ev) => ChangingMicroHIDPickupState.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before item inspection is started.
+        /// </summary>
+        /// <param name="ev">The <see cref="InspectingItemEventArgs"/> instance.</param>
+        public static void OnInspectingItem(InspectingItemEventArgs ev) => InspectingItem.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before item inspection is started.
+        /// </summary>
+        /// <param name="ev">The <see cref="InspectedItemEventArgs"/> instance.</param>
+        public static void OnInspectedItem(InspectedItemEventArgs ev) => InspectedItem.InvokeSafely(ev);
     }
 }

EXILED/Exiled.Events/Handlers/Scp939.cs

@@ -74,6 +74,11 @@ public static class Scp939
         /// </summary>
         public static Event<ValidatingVisibilityEventArgs> ValidatingVisibility { get; set; } = new();
 
+        /// <summary>
+        /// Invoked before mimicry point is placed.
+        /// </summary>
+        public static Event<PlacingMimicPointEventArgs> PlacingMimicPoint { get; set; } = new();
+
         /// <summary>
         /// Called before SCP-939 changes its target focus.
         /// </summary>
@@ -139,5 +144,11 @@ public static class Scp939
         /// </summary>
         /// <param name="ev">The <see cref="ValidatingVisibilityEventArgs"/> instance.</param>
         public static void OnValidatingVisibility(ValidatingVisibilityEventArgs ev) => ValidatingVisibility.InvokeSafely(ev);
+
+        /// <summary>
+        /// Called before mimicry point is placed.
+        /// </summary>
+        /// <param name="ev">The <see cref="PlacingMimicPointEventArgs"/> instance.</param>
+        public static void OnPlacingMimicPoint(PlacingMimicPointEventArgs ev) => PlacingMimicPoint.InvokeSafely(ev);
     }
 }