Fix Error from #394

commit 99a84fd Author: Yamato <louismonneyron5@yahoo.com> Date: Thu Jan 16 18:39:19 2025 +0100 Everything is Obsolete commit a4af0c9 Author: Yamato <louismonneyron5@yahoo.com> Date: Thu Jan 16 18:21:28 2025 +0100 also revert IsAvailableHoliday since it's impossible to get it's instance commit a4dfb3e Author: Yamato <louismonneyron5@yahoo.com> Date: Thu Jan 16 18:13:20 2025 +0100 revert change commit b468988 Author: Yamato <louismonneyron5@yahoo.com> Date: Thu Jan 16 18:11:02 2025 +0100 Fix Error commit 235d7aa Author: Yamato <louismonneyron5@yahoo.com> Date: Thu Jan 16 18:09:06 2025 +0100 Using Obsolete commit fba9eda Merge: 5598231 c6816f9 Author: Yamato <66829532+louis1706@users.noreply.github.com> Date: Thu Jan 16 16:59:53 2025 +0100 Merge branch 'xmas-2024' into Only-availaible-for-Christmas-and-AprilFools commit 5598231 Author: Yamato <louismonneyron5@yahoo.com> Date: Wed Jan 15 12:25:57 2025 +0100 Only availaible for Christmas and AprilFools
ExMod-Team · Jan 16, 2025 · fb89fe9 · fb89fe9
1 parent c6816f9
commit fb89fe9
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 20 deletions.
diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs
@@ -263,21 +263,25 @@ public enum EffectType
         /// <summary>
         /// Makes you a flamingo.
         /// </summary>
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         BecomingFlamingo,
 
         /// <summary>
         /// Makes you a Child after eating Cake.
         /// </summary>
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp559,
 
         /// <summary>
         /// Scp956 found you.
         /// </summary>
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Scp956Target,
 
         /// <summary>
         /// you are snowed.
         /// </summary>
+        [Obsolete("Only availaible for Christmas and AprilFools.")]
         Snowed,
     }
 }
diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
@@ -67,9 +67,6 @@ public static class EffectTypeExtension
             { EffectType.AntiScp207, typeof(AntiScp207) },
             { EffectType.Scanned, typeof(Scanned) },
             { EffectType.SilentWalk, typeof(SilentWalk) },
-#pragma warning disable CS0618
-            { EffectType.Marshmallow, typeof(MarshmallowEffect) },
-#pragma warning restore CS0618
             { EffectType.Strangled, typeof(Strangled) },
             { EffectType.Ghostly, typeof(Ghostly) },
             { EffectType.FogControl, typeof(FogControl) },
@@ -78,10 +75,13 @@ public static class EffectTypeExtension
             { EffectType.SeveredEyes, typeof(SeveredEyes) },
             { EffectType.PitDeath, typeof(PitDeath) },
             { EffectType.Blurred, typeof(Blurred) },
+            #pragma warning disable CS0618
+            { EffectType.Marshmallow, typeof(MarshmallowEffect) },
             { EffectType.BecomingFlamingo, typeof(BecomingFlamingo) },
             { EffectType.Scp559, typeof(Scp559Effect) },
             { EffectType.Scp956Target, typeof(Scp956Target) },
             { EffectType.Snowed, typeof(Snowed) },
+            #pragma warning restore CS0618
         });
 
         /// <summary>

diff --git a/EXILED/Exiled.API/Features/Map.cs b/EXILED/Exiled.API/Features/Map.cs
@@ -376,7 +376,9 @@ internal static void ClearCache()
             Firearm.BaseCodesValue.Clear();
             Firearm.AvailableAttachmentsValue.Clear();
 
+#pragma warning disable CS0618
             Scp559.CakeToWrapper.Clear();
+#pragma warning restore CS0618
 
             Coffee.BaseToWrapper.Clear();
         }

diff --git a/EXILED/Exiled.API/Features/Roles/Role.cs b/EXILED/Exiled.API/Features/Roles/Role.cs
@@ -236,7 +236,9 @@ public virtual void Set(RoleTypeId newRole, SpawnReason reason, RoleSpawnFlags s
             FilmmakerGameRole filmmakerRole => new FilmMakerRole(filmmakerRole),
             NoneGameRole noneRole => new NoneRole(noneRole),
             DestroyedGameRole destroyedRole => new DestroyedRole(destroyedRole),
+#pragma warning disable CS0618 // Le type ou le membre est obsolète
             Scp1507GameRole scp1507 => new Scp1507Role(scp1507),
+#pragma warning restore CS0618 // Le type ou le membre est obsolète
             _ => throw new Exception($"Missing role found in Exiled.API.Features.Roles.Role::Create ({role?.RoleTypeId}). Please contact an Exiled developer."),
         };
     }

diff --git a/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs b/EXILED/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -7,28 +7,20 @@
 
 namespace Exiled.API.Features.Roles
 {
+    using System;
     using System.Collections.Generic;
 
-    using Exiled.API.Enums;
-    using Exiled.API.Features.Pools;
-
     using PlayerRoles;
     using PlayerRoles.PlayableScps;
     using PlayerRoles.PlayableScps.HumeShield;
-    using PlayerRoles.PlayableScps.Scp939;
-    using PlayerRoles.PlayableScps.Scp939.Mimicry;
-    using PlayerRoles.PlayableScps.Scp939.Ripples;
     using PlayerRoles.Subroutines;
 
-    using RelativePositioning;
-
-    using UnityEngine;
-
     using Scp1507GameRole = PlayerRoles.PlayableScps.Scp1507.Scp1507Role;
 
     /// <summary>
     /// Defines a role that represents SCP-1507.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp1507Role : FpcRole, ISubroutinedScpRole, IHumeShieldRole, ISpawnableScp
     {
         /// <summary>

diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs
@@ -18,6 +18,7 @@ namespace Exiled.API.Features
     /// <summary>
     /// Represents a cake.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class Scp559 : IWrapper<Scp559Cake>, IPosition
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp1507Event.cs
@@ -7,11 +7,14 @@
 
 namespace Exiled.Events.EventArgs.Interfaces
 {
+    using System;
+
     using Exiled.API.Features.Roles;
 
     /// <summary>
     /// Event args used for all <see cref="Scp1507Role"/> related events.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp1507Event : IPlayerEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs b/EXILED/Exiled.Events/EventArgs/Interfaces/IScp559Event.cs
@@ -7,9 +7,12 @@
 
 namespace Exiled.Events.EventArgs.Interfaces
 {
+    using System;
+
     /// <summary>
     /// Defines the base contract for all <see cref="Scp559Cake"/> related events.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public interface IScp559Event : IExiledEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/AttackingDoorEventArgs.cs
@@ -7,6 +7,8 @@
 
 namespace Exiled.Events.EventArgs.Scp1507
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.API.Features.Doors;
     using Exiled.API.Features.Roles;
@@ -16,6 +18,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before SCP-1507 attacks door.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class AttackingDoorEventArgs : IScp1507Event, IDeniableEvent, IDoorEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/ScreamingEventArgs.cs
@@ -7,13 +7,16 @@
 
 namespace Exiled.Events.EventArgs.Scp1507
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.API.Features.Roles;
     using Exiled.Events.EventArgs.Interfaces;
 
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class ScreamingEventArgs : IScp1507Event, IDeniableEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/SpawningFlamingosEventArgs.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.EventArgs.Scp1507
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -18,6 +19,7 @@ namespace Exiled.Events.EventArgs.Scp1507
     /// <summary>
     /// Contains all information before flamingos get spawned.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningFlamingosEventArgs : IDeniableEvent, IPlayerEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1507/UsingTapeEventArgs.cs
@@ -7,15 +7,17 @@
 
 namespace Exiled.Events.EventArgs.Scp1507
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.API.Features.Items;
-    using Exiled.API.Features.Roles;
     using Exiled.Events.EventArgs.Interfaces;
     using InventorySystem.Items;
 
     /// <summary>
     /// Contains all information before SCP-1507 screams.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class UsingTapeEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/InteractingScp559EventArgs.cs
@@ -7,12 +7,15 @@
 
 namespace Exiled.Events.EventArgs.Scp559
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.Events.EventArgs.Interfaces;
 
     /// <summary>
     /// Contains all information before a player interacts with SCP-559.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class InteractingScp559EventArgs : IScp559Event, IDeniableEvent, IPlayerEvent
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp559/SpawningEventArgs.cs
@@ -7,13 +7,16 @@
 
 namespace Exiled.Events.EventArgs.Scp559
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.Events.EventArgs.Interfaces;
     using UnityEngine;
 
     /// <summary>
     /// Contains all information before SCP-559 spawns.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public class SpawningEventArgs : IDeniableEvent, IScp559Event
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/Handlers/Scp1507.cs b/EXILED/Exiled.Events/Handlers/Scp1507.cs
@@ -7,6 +7,8 @@
 
 namespace Exiled.Events.Handlers
 {
+    using System;
+
     using Exiled.Events.EventArgs.Scp1507;
     using Exiled.Events.Features;
 
@@ -15,6 +17,7 @@ namespace Exiled.Events.Handlers
     /// <summary>
     /// SCP-1507 related events.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp1507
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/Handlers/Scp559.cs b/EXILED/Exiled.Events/Handlers/Scp559.cs
@@ -7,13 +7,17 @@
 
 namespace Exiled.Events.Handlers
 {
+    using System;
+
     using Exiled.Events.EventArgs.Scp559;
     using Exiled.Events.Features;
+
 #pragma warning disable SA1623
 
     /// <summary>
     /// All SCP-559 related events.
     /// </summary>
+    [Obsolete("Only availaible for Christmas and AprilFools.")]
     public static class Scp559
     {
         /// <summary>

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/AttackingDoor.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/AttackingDoor.cs
@@ -7,16 +7,15 @@
 
 namespace Exiled.Events.Patches.Events.Scp1507
 {
+#pragma warning disable CS0618
     using System.Collections.Generic;
     using System.Reflection.Emit;
 
     using Exiled.API.Features;
-    using Exiled.API.Features.Doors;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp1507;
     using HarmonyLib;
-    using Interactables.Interobjects.DoorUtils;
     using PlayerRoles.PlayableScps.Scp1507;
 
     using static HarmonyLib.AccessTools;

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/Scream.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/Scream.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Scp1507
 {
+#pragma warning disable CS0618
     using System.Collections.Generic;
     using System.Reflection.Emit;
 

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/SpawningFlamingos.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/SpawningFlamingos.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Scp1507
 {
+#pragma warning disable CS0618
     using System.Collections.Generic;
     using System.Linq;
     using System.Reflection.Emit;

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/TapeUsing.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/TapeUsing.cs
@@ -7,16 +7,16 @@
 
 namespace Exiled.Events.Patches.Events.Scp1507
 {
+#pragma warning disable CS0618
+
     using System.Collections.Generic;
     using System.Reflection.Emit;
 
-    using Exiled.API.Features;
     using Exiled.API.Features.Pools;
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp1507;
     using HarmonyLib;
     using InventorySystem.Items.FlamingoTapePlayer;
-    using PlayerRoles.PlayableScps.Scp1507;
 
     using static HarmonyLib.AccessTools;
 

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Interacting.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Scp559
 {
+#pragma warning disable CS0618
     using System.Collections.Generic;
     using System.Reflection.Emit;
 

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs b/EXILED/Exiled.Events/Patches/Events/Scp559/Spawning.cs
@@ -7,6 +7,7 @@
 
 namespace Exiled.Events.Patches.Events.Scp559
 {
+#pragma warning disable CS0618
     using System.Collections.Generic;
     using System.Reflection.Emit;
 

diff --git a/EXILED/Exiled.Events/Patches/Generic/Scp559List.cs b/EXILED/Exiled.Events/Patches/Generic/Scp559List.cs
@@ -7,11 +7,12 @@
 
 namespace Exiled.Events.Patches.Generic
 {
+#pragma warning disable SA1313
+#pragma warning disable CS0618
+
     using Exiled.API.Features;
     using HarmonyLib;
 
-#pragma warning disable SA1313
-
     /// <summary>
     /// Patches <see cref="Scp559Cake.Start"/>
     /// to control <see cref="Scp559.List"/>.