Merge branch 'dev' into LabAPI

Author: louis1706

EXILED/Exiled.API/Enums/SpawnLocationType.cs

@@ -143,5 +143,30 @@ public enum SpawnLocationType
         /// Just inside the LCZ WC door.
         /// </summary>
         InsideLczWc,
+
+        /// <summary>
+        /// Inside the Glass Box in GR-18.
+        /// </summary>
+        InsideGr18Glass,
+
+        /// <summary>
+        /// Inside 106's Primary Door
+        /// </summary>
+        Inside106Primary,
+
+        /// <summary>
+        /// Inside 106's Secondary Door
+        /// </summary>
+        Inside106Secondary,
+
+        /// <summary>
+        /// Inside 939 Cryo Chamber
+        /// </summary>
+        Inside939Cryo,
+
+        /// <summary>
+        /// Inside SCP-079's Armory
+        /// </summary>
+        Inside079Armory,
     }
 }

EXILED/Exiled.API/Extensions/EffectTypeExtension.cs

@@ -175,7 +175,7 @@ or EffectType.Disabled or EffectType.Ensnared or EffectType.Exhausted or EffectT
         /// <seealso cref="IsHealing(EffectType)"/>
         public static bool IsPositive(this EffectType effect) => effect is EffectType.BodyshotReduction or EffectType.DamageReduction
             or EffectType.Invigorated or EffectType.Invisible or EffectType.MovementBoost or EffectType.RainbowTaste
-            or EffectType.Scp207 or EffectType.Scp1853 or EffectType.Vitality or EffectType.AntiScp207 or EffectType.Ghostly;
+            or EffectType.Scp207 or EffectType.Scp1853 or EffectType.Vitality or EffectType.AntiScp207 or EffectType.Ghostly or EffectType.Scp1344;
 
         /// <summary>
         /// Returns whether the provided <paramref name="effect"/> affects the player's movement speed.

EXILED/Exiled.API/Extensions/SpawnExtensions.cs

@@ -34,6 +34,7 @@ public static class SpawnExtensions
             SpawnLocationType.Inside914,
             SpawnLocationType.Inside049Armory,
             SpawnLocationType.InsideLczCafe,
+            SpawnLocationType.Inside939Cryo,
         };
 
         /// <summary>
@@ -102,6 +103,11 @@ public static Vector3 GetPosition(this SpawnLocationType location)
             SpawnLocationType.Inside173Connector => "173_CONNECTOR",
             SpawnLocationType.InsideEscapePrimary => "ESCAPE_PRIMARY",
             SpawnLocationType.InsideEscapeSecondary => "ESCAPE_SECONDARY",
+            SpawnLocationType.InsideGr18Glass => "GR18_INNER",
+            SpawnLocationType.Inside106Primary => "106_PRIMARY",
+            SpawnLocationType.Inside106Secondary => "106_SECONDARY",
+            SpawnLocationType.Inside939Cryo => "939_CRYO",
+            SpawnLocationType.Inside079Armory => "079_ARMORY",
             _ => default,
         };
     }

EXILED/Exiled.API/Features/Core/UserSettings/SettingBase.cs

@@ -218,6 +218,14 @@ public static void SendToAll(Func<Player, bool> predicate)
         /// <param name="player">Target player.</param>
         public static void SendToPlayer(Player player) => ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub);
 
+        /// <summary>
+        /// Syncs specific settings with the specified target.
+        /// </summary>
+        /// <param name="player">Target player.</param>
+        /// <param name="settings">Settings to send to the player.</param>
+        public static void SendToPlayer(Player player, IEnumerable<SettingBase> settings) =>
+            ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, settings.Select(setting => setting.Base).ToArray());
+
         /// <summary>
         /// Registers all settings from the specified collection.
         /// </summary>

EXILED/Exiled.API/Features/Items/Firearm.cs

@@ -364,30 +364,29 @@ public static Firearm Create(FirearmType type)
         /// <param name="identifier">The <see cref="AttachmentIdentifier"/> to add.</param>
         public void AddAttachment(AttachmentIdentifier identifier)
         {
-            uint toRemove = 0;
-            uint code = 1;
+            // Fallback addedCode onto AvailableAttachments' code in case it's 0
+            uint addedCode = identifier.Code == 0
+                ? AvailableAttachments[FirearmType].FirstOrDefault(attId => attId.Name == identifier.Name).Code
+                : identifier.Code;
+
+            // Look for conflicting attachment (attachment that occupies the same slot)
+            uint conflicting = 0;
+            uint current = 1;
 
             foreach (Attachment attachment in Base.Attachments)
             {
                 if (attachment.Slot == identifier.Slot && attachment.IsEnabled)
                 {
-                    toRemove = code;
+                    conflicting = current;
                     break;
                 }
 
-                code *= 2;
+                current *= 2;
             }
 
-            uint newCode = identifier.Code == 0
-                ? AvailableAttachments[FirearmType].FirstOrDefault(
-                    attId =>
-                        attId.Name == identifier.Name).Code
-                : identifier.Code;
-
-            Base.ApplyAttachmentsCode((Base.GetCurrentAttachmentsCode() & ~toRemove) | newCode, true);
-
-            // TODO Not finish
-            // Base.Status = new FirearmStatus(Math.Min(Ammo, MaxAmmo), Base.Status.Flags, Base.GetCurrentAttachmentsCode());
+            uint code = Base.ValidateAttachmentsCode((Base.GetCurrentAttachmentsCode() & ~conflicting) | addedCode);
+            Base.ApplyAttachmentsCode(code, false);
+            AttachmentCodeSync.ServerSetCode(Serial, code);
         }
 
         /// <summary>

EXILED/Exiled.API/Features/Map.cs

@@ -13,6 +13,8 @@ namespace Exiled.API.Features
     using System.Collections.ObjectModel;
     using System.Linq;
 
+    using CommandSystem.Commands.RemoteAdmin.Cleanup;
+    using Decals;
     using Enums;
     using Exiled.API.Extensions;
     using Exiled.API.Features.Hazards;
@@ -27,6 +29,7 @@ namespace Exiled.API.Features
     using PlayerRoles.Ragdolls;
     using UnityEngine;
     using Utils;
+    using Utils.Networking;
 
     using Object = UnityEngine.Object;
 
@@ -130,6 +133,17 @@ public static void Broadcast(ushort duration, string message, global::Broadcast.
             Server.Broadcast.RpcAddElement(message, duration, type);
         }
 
+        /// <summary>
+        /// Broadcasts delegate invocation result to all <see cref="Player">players</see>.
+        /// </summary>
+        /// <param name="duration">The duration in seconds.</param>
+        /// <param name="func">The delegate whose invocation result will be the message.</param>
+        public static void Broadcast(ushort duration, Func<Player, string> func)
+        {
+            foreach (Player player in Player.List)
+                player.Broadcast(duration, func.Invoke(player));
+        }
+
         /// <summary>
         /// Shows a hint to all <see cref="Player">players</see>.
         /// </summary>
@@ -271,6 +285,19 @@ public static void CleanAllRagdolls(IEnumerable<Ragdoll> ragDolls)
                 ragDoll.Destroy();
         }
 
+        /// <summary>
+        /// Destroy specified amount of specified <see cref="DecalPoolType"/> object.
+        /// </summary>
+        /// <param name="decalType">Decal type to destroy.</param>
+        /// <param name="amount">Amount of decals to destroy.</param>
+        public static void Clean(DecalPoolType decalType, int amount) => new DecalCleanupMessage(decalType, amount).SendToAuthenticated();
+
+        /// <summary>
+        /// Destroy all specified <see cref="DecalPoolType"/> objects.
+        /// </summary>
+        /// <param name="decalType">Decal type to destroy.</param>
+        public static void Clean(DecalPoolType decalType) => Clean(decalType, int.MaxValue);
+
         /// <summary>
         /// Places a blood decal.
         /// </summary>

EXILED/Exiled.API/Features/Pickups/FirearmPickup.cs

@@ -7,6 +7,8 @@
 
 namespace Exiled.API.Features.Pickups
 {
+    using System;
+
     using Exiled.API.Interfaces;
 
     using InventorySystem.Items;
@@ -56,7 +58,8 @@ internal FirearmPickup(ItemType type)
         /// <summary>
         /// Gets a value indicating whether the pickup is already distributed.
         /// </summary>
-        public bool IsDistributed { get; internal set; }
+        [Obsolete("Feature deprecated")]
+        public bool IsDistributed { get; }
 
         /// <summary>
         /// Gets or sets a value indicating how much ammo can contain this <see cref="FirearmPickup"/>.
@@ -104,7 +107,7 @@ public int Ammo
         }
 
         /// <summary>
-        /// Gets or sets a ammo drain per shoot.
+        /// Gets or sets the ammo drain per shoot.
         /// </summary>
         /// <remarks>
         /// Always <see langword="1"/> by default.
@@ -121,19 +124,16 @@ public uint Attachments
             set => Base.Worldmodel.Setup(Base.CurId, Base.Worldmodel.WorldmodelType, value);
         }
 
-        /// <inheritdoc />
-        public override void Spawn()
-        {
-            base.Spawn();
-            if (!IsDistributed)
-                Base.OnDistributed();
-        }
+        /// <summary>
+        /// Initializes the item as if it was spawned naturally by map generation.
+        /// </summary>
+        public void Distribute() => Base.OnDistributed();
 
         /// <summary>
-        /// Returns the FirearmPickup in a human readable format.
+        /// Returns the FirearmPickup in a human-readable format.
         /// </summary>
         /// <returns>A string containing FirearmPickup related data.</returns>
-        public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* |{IsDistributed}| -{/*Ammo*/0}-";
+        public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}*";
 
         /// <inheritdoc/>
         internal override void ReadItemInfo(Items.Item item)

EXILED/Exiled.API/Features/Player.cs

@@ -137,7 +137,7 @@ public Player(GameObject gameObject)
         /// <summary>
         /// Gets a list of all <see cref="Player"/>'s on the server.
         /// </summary>
-        public static IReadOnlyCollection<Player> List => Dictionary.Values.Where(x => !x.IsNPC).ToList();
+        public static IReadOnlyCollection<Player> List => Dictionary.Values.ToList();
 
         /// <summary>
         /// Gets a <see cref="Dictionary{TKey, TValue}"/> containing cached <see cref="Player"/> and their user ids.
@@ -2913,6 +2913,26 @@ public bool TryAddCandy(CandyKindID candyType)
             return true;
         }
 
+        /// <summary>
+        /// Removes specific candy from the players <see cref="Scp330"/>.
+        /// </summary>
+        /// <param name="candyType">The <see cref="CandyKindID"/> to remove.</param>
+        /// <param name="removeAll">Remove all candy of that type.</param>
+        /// <returns><see langword="true"/> if a candy was removed.</returns>
+        public bool TryRemoveCandу(CandyKindID candyType, bool removeAll = false)
+        {
+            foreach (Item item in Items)
+            {
+                if (item is not Scp330 bag)
+                    continue;
+
+                if (bag.RemoveCandy(candyType, removeAll) > 0)
+                    return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Resets the player's inventory to the provided list of items, clearing any items it already possess.
         /// </summary>

EXILED/Exiled.API/Features/Server.cs

@@ -174,7 +174,20 @@ public static int MaxPlayerCount
         /// Read the VSR for more info about its usage.
         /// </remarks>
         /// </summary>
+        [Obsolete("This field has been deleted because it used the wrong field (TransparentlyModded)")]
         public static bool IsHeavilyModded
+        {
+            get => false;
+            set => _ = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the server is marked as Transparently Modded.
+        /// <remarks>
+        /// It is not used now, wait for a new VSR update.
+        /// </remarks>
+        /// </summary>
+        public static bool IsTransparentlyModded
         {
             get => ServerConsole.TransparentlyModdedServerConfig;
             set => ServerConsole.TransparentlyModdedServerConfig = value;

EXILED/Exiled.API/Features/Toys/AdminToy.cs

@@ -115,6 +115,16 @@ public Vector3 Scale
             }
         }
 
+        /// <summary>
+        /// Gets the <see cref="UnityEngine.GameObject"/> of the toy.
+        /// </summary>
+        public GameObject GameObject => AdminToyBase.gameObject;
+
+        /// <summary>
+        /// Gets the <see cref="UnityEngine.Transform"/> of the toy.
+        /// </summary>
+        public Transform Transform => AdminToyBase.transform;
+
         /// <summary>
         /// Gets or sets the movement smoothing value of the toy.
         /// <para>