fix: TargetVisibilityState returing only None & SeenByDetonation (#841)

Author: MS-crew

EXILED/Exiled.API/Enums/Scp939VisibilityStates.cs

@@ -43,5 +43,10 @@ public enum Scp939VisibilityState
         /// SCP-939 sees another player for a while, after it's out of range.
         /// </summary>
         SeenByLastTime,
+
+        /// <summary>
+        /// SCP-939 sees another player, who is the last human player in the round.
+        /// </summary>
+        SeenByLastHuman,
     }
 }

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

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="ValidatingVisibilityEventArgs.cs" company="ExMod Team">
 // Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
@@ -11,8 +11,11 @@ namespace Exiled.Events.EventArgs.Scp939
 
     using Exiled.API.Enums;
     using Exiled.API.Features.Roles;
+
     using Interfaces;
 
+    using PlayerRoles.PlayableScps.HumanTracker;
+
     /// <summary>
     /// Contains all information before SCP-939 sees the player.
     /// </summary>
@@ -35,7 +38,11 @@ public ValidatingVisibilityEventArgs(Scp939VisibilityState state, ReferenceHub p
             Player = Player.Get(player);
             Scp939 = Player.Role.As<Scp939Role>();
             Target = Player.Get(target);
-            TargetVisibilityState = state;
+            TargetVisibilityState = state switch
+            {
+                Scp939VisibilityState.SeenByDetonation when !Warhead.IsDetonated && LastHumanTracker.IsLastTarget(target) => Scp939VisibilityState.SeenByLastHuman,
+                _ => state,
+            };
             IsAllowed = TargetVisibilityState is not(Scp939VisibilityState.NotSeen or Scp939VisibilityState.None);
             IsLateSeen = TargetVisibilityState is Scp939VisibilityState.SeenByRange;
         }

EXILED/Exiled.Events/Patches/Events/Scp939/ValidatingVisibility.cs

@@ -44,25 +44,22 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label ret = generator.DefineLabel();
             Label end = generator.DefineLabel();
 
-            int offset = 0;
-            int index = newInstructions.FindIndex(i => i.LoadsConstant(0)) + offset;
+            int index = newInstructions.FindIndex(i => i.LoadsConstant(0));
 
             newInstructions[index].labels.Add(ret);
 
             newInstructions.InsertRange(index, StaticCallEvent(generator, ev, ret, newInstructions[index], Scp939VisibilityState.None, false));
 
-            offset = 0;
-            index = newInstructions.FindIndex(i => i.LoadsConstant(1)) + offset;
+            index = newInstructions.FindIndex(i => i.LoadsConstant(1));
 
             newInstructions.InsertRange(index, StaticCallEvent(generator, ev, ret, newInstructions[index], Scp939VisibilityState.SeenAsScp));
 
-            offset = 2;
+            int offset = 4;
             index = newInstructions.FindIndex(i => i.Calls(PropertyGetter(typeof(AlphaWarheadController), nameof(AlphaWarheadController.Detonated)))) + offset;
 
             newInstructions.InsertRange(index, StaticCallEvent(generator, ev, ret, newInstructions[index], Scp939VisibilityState.SeenByDetonation));
 
-            offset = 0;
-            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldloc_3) + offset;
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldloc_3);
 
             // just pre-check for SeenByLastTime or NotSeen VisibilityState, and then il inject
             newInstructions.InsertRange(index, Enumerable.Concat(
@@ -77,8 +74,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 },
                 CallEvent(generator, ev, ret)));
 
-            offset = 0;
-            index = newInstructions.FindLastIndex(i => i.LoadsField(Field(typeof(Scp939VisibilityController), nameof(Scp939VisibilityController.LastSeen)))) + offset;
+            index = newInstructions.FindLastIndex(i => i.LoadsField(Field(typeof(Scp939VisibilityController), nameof(Scp939VisibilityController.LastSeen))));
 
             newInstructions.InsertRange(index, StaticCallEvent(generator, ev, ret, newInstructions[index], Scp939VisibilityState.SeenByRange));