Merge branch 'xmas-2024-from-xmas-2023' into Adding-TapeUsingEvent

ExMod-Team · Dec 26, 2024 · b85aad0 · b85aad0
2 parents 4547fd0 + 5b31a05
commit b85aad0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/EXILED/Exiled.API/Features/Coffee.cs b/EXILED/Exiled.API/Features/Coffee.cs
@@ -56,6 +56,7 @@ public static IEnumerable<Player> BlacklistedPlayers
         /// <summary>
         /// Gets the list with all available <see cref="Coffee"/> instanses.
         /// </summary>
+        [Obsolete("This list will be empty")]
         public static IReadOnlyCollection<Coffee> List => BaseToWrapper.Values;
 
         /// <summary>
@@ -107,6 +108,7 @@ public string TranslationAuthor
         /// </summary>
         /// <param name="predicate">The condition to satisfy.</param>
         /// <returns>A <see cref="IEnumerable{T}"/> of <see cref="Coffee"/> matching the condition.</returns>
+        [Obsolete("The respond list will be empty")]
         public static IEnumerable<Coffee> Get(Func<Coffee, bool> predicate) => List.Where(predicate);
 
         /// <summary>

diff --git a/EXILED/Exiled.API/Features/Scp3114Ragdoll.cs b/EXILED/Exiled.API/Features/Scp3114Ragdoll.cs
@@ -67,7 +67,7 @@ public float RevealElapsed
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether or not this corpse will trigger animation.
+        /// Gets or sets a value indicating whether this corpse will trigger animation.
         /// </summary>
         public bool IsPlayingAnimation
         {

diff --git a/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs b/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs
@@ -41,6 +41,7 @@ public static void OnMapGenerated()
             PlayerRoles.RoleAssign.HumanSpawner.Handlers[PlayerRoles.Team.ChaosInsurgency] = new PlayerRoles.RoleAssign.OneRoleHumanSpawner(PlayerRoles.RoleTypeId.ChaosConscript);
             PlayerRoles.RoleAssign.HumanSpawner.Handlers[PlayerRoles.Team.OtherAlive] = new PlayerRoles.RoleAssign.OneRoleHumanSpawner(PlayerRoles.RoleTypeId.Tutorial);
             PlayerRoles.RoleAssign.HumanSpawner.Handlers[PlayerRoles.Team.Dead] = new PlayerRoles.RoleAssign.OneRoleHumanSpawner(PlayerRoles.RoleTypeId.Spectator);
+            PlayerRoles.RoleAssign.HumanSpawner.Handlers[PlayerRoles.Team.Flamingos] = new PlayerRoles.RoleAssign.OneRoleHumanSpawner(PlayerRoles.RoleTypeId.Flamingo);
 
             Timing.CallDelayed(1, Handlers.Map.OnGenerated);
         }

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/AttackingDoor.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/AttackingDoor.cs
@@ -33,7 +33,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            int offset = 2;
+            int offset = -5;
             int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldloc_S) + offset;
 
             Label continueLabel = generator.DefineLabel();

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp1507/Scream.cs b/EXILED/Exiled.Events/Patches/Events/Scp1507/Scream.cs
@@ -31,15 +31,9 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldarg_0);
-
             Label retLabel = generator.DefineLabel();
 
-            newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
-
-            newInstructions.InsertRange(
-                index,
-                new CodeInstruction[]
+            newInstructions.InsertRange(0, new CodeInstruction[]
                 {
                     // Player.Get(this.Owner);
                     new(OpCodes.Ldarg_0),
@@ -62,6 +56,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Brfalse_S, retLabel),
                 });
 
+            newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
+
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 

diff --git a/...atches/Events/Scp559/SpawningFlamingos.cs → ...tches/Events/Scp1507/SpawningFlamingos.cs b/...atches/Events/Scp559/SpawningFlamingos.cs → ...tches/Events/Scp1507/SpawningFlamingos.cs
@@ -32,13 +32,12 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
-            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldc_I4_4);
-
             Label retLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(SpawningFlamingosEventArgs));
 
-            newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
+            int offset = 0;
+            int index = newInstructions.FindIndex(x => x.opcode == OpCodes.Ldc_I4_4) + offset;
 
             newInstructions.InsertRange(
                 index,
@@ -72,7 +71,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Stsfld, Field(typeof(Scp1507Spawner), nameof(Scp1507Spawner._alpha))),
                 });
 
-            index = newInstructions.FindIndex(x => x.Is(OpCodes.Call, PropertyGetter(typeof(ReferenceHub), nameof(ReferenceHub.AllHubs))));
+            index = newInstructions.FindIndex(x => x.Calls(PropertyGetter(typeof(ReferenceHub), nameof(ReferenceHub.AllHubs))));
 
             newInstructions.RemoveAt(index);
 
@@ -86,6 +85,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Call, Method(typeof(SpawningFlamingos), nameof(ReturnEnumerator))),
                 });
 
+            newInstructions[newInstructions.Count - 1].labels.Add(retLabel);
+
             for (int z = 0; z < newInstructions.Count; z++)
                 yield return newInstructions[z];
 

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/FindingPosition.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/FindingPosition.cs
@@ -73,6 +73,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                     new(OpCodes.Ldloc_S, ev.LocalIndex),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(FindingPositionEventArgs), nameof(FindingPositionEventArgs.Spawnpoint))),
                     new(OpCodes.Stind_Ref),
+
+                    new(OpCodes.Br_S, continueLabel),
                 });
 
             for (int z = 0; z < newInstructions.Count; z++)

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/GrantingGift.cs
@@ -36,7 +36,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             LocalBuilder ev = generator.DeclareLocal(typeof(GrantingGiftEventArgs));
 
             int offset = -1;
-            int index = newInstructions.FindLastIndex(x => x.opcode == OpCodes.Ldfld && x.operand == (object)Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy))) + offset;
+            int index = newInstructions.FindLastIndex(x => x.LoadsField(Field(typeof(Scp2536GiftBase), nameof(Scp2536GiftBase.ObtainedBy)))) + offset;
 
             newInstructions.InsertRange(index, new CodeInstruction[]
             {

diff --git a/EXILED/Exiled.Events/Patches/Events/Scp2536/OpeningGift.cs b/EXILED/Exiled.Events/Patches/Events/Scp2536/OpeningGift.cs
@@ -34,12 +34,12 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label retLabel = generator.DefineLabel();
 
             int offset = -3;
-            int index = newInstructions.FindLastIndex(x => x.operand == (object)Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.RpcSetGiftState))) + offset;
+            int index = newInstructions.FindLastIndex(x => x.Calls(Method(typeof(Scp2536GiftController), nameof(Scp2536GiftController.RpcSetGiftState)))) + offset;
 
             newInstructions.InsertRange(index, new CodeInstruction[]
                 {
                     // Player.Get(hub);
-                    new(OpCodes.Ldarg_1),
+                    new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // true