Merge pull request #86 from UncomplicatedCustomServer/dev-labapi

v9.5.0 - LabApi 1.1.7

Author: FoxWorn3365

UncomplicatedCustomRoles/API/Features/SummonedCustomRole.cs

@@ -264,7 +264,7 @@ private void EvaluateRoleBase()
 
                 Timing.CallDelayed(3.25f, delegate {
                     _roleBase.Pooled = false;
-                    DisguiseTeam.RoleBaseList.Add(Player.PlayerId, _roleBase);
+                    DisguiseTeam.RoleBaseList[Player.PlayerId] = _roleBase;
                 });
 
             }

UncomplicatedCustomRoles/Integrations/UCT.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * This file is a part of the UncomplicatedCustomRoles project.
  *
  * Copyright (c) 2023-present FoxWorn3365 (Federico Cosma) <me@fcosma.it>
@@ -8,13 +8,46 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
+using System;
+using LabApi.Features.Wrappers;
+using UncomplicatedCustomRoles.Manager;
+
 namespace UncomplicatedCustomRoles.Integrations
 {
     internal static class UCT
     {
-        /*public static bool GetCustomTeam(Player player, out uint team)
-        { TODO // INTEGRATION WITH UCT IS ON HOLD
-            object role = DynamicInvoke.GetMethod("UncomplicatedCustomTeams", "UncomplicatedCustomTeams.API.Features.SummonedTeam.SummonedPlayersTryGet"); ON HOLD
-        }*/
+        private const string PluginName = "UncomplicatedCustomTeams";
+        
+        public static bool TryGetCustomTeamId(Player player, out uint teamId)
+        {
+            teamId = 0;
+            try
+            {
+                object summonedTeam = DynamicInvoke.GetMethod(PluginName,
+                    "UncomplicatedCustomTeams.API.TeamExtensions.GetCustomTeam", true)?
+                    .Invoke(null, new object[] { player });
+
+                if (summonedTeam is null)
+                    return false;
+
+                object definition = DynamicInvoke.GetMethod(PluginName,
+                    "UncomplicatedCustomTeams.API.Features.Runtime.SummonedTeam.Definition_get", true)?
+                    .Invoke(summonedTeam, null);
+
+                if (definition is null)
+                    return false;
+
+                teamId = Convert.ToUInt32(DynamicInvoke.GetMethod(PluginName,
+                    "UncomplicatedCustomTeams.API.Features.Definitions.Team.Id_get", true)?
+                    .Invoke(definition, null));
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                LogManager.Error(e.ToString());
+                return false;
+            }
+        }
     }
-}
+}

UncomplicatedCustomRoles/Manager/SpawnManager.cs

@@ -340,7 +340,7 @@ public static void SummonSubclassApplier(Player Player, ICustomRole Role)
         public static KeyValuePair<bool, object>? ParseEscapeRole(Dictionary<string, string> roleAfterEscape, Player player)
         {
             Dictionary<Team, KeyValuePair<bool, object>?> AsCuffedByInternalTeam = new();
-            Dictionary<uint, KeyValuePair<bool, object>?> AsCuffedByCustomTeam = new(); //we will add the support to UCT and UIU-RS
+            Dictionary<uint, KeyValuePair<bool, object>?> AsCuffedByCustomTeam = new();
             // cuffed by InternalTeam FoundationForces
             //   0     1       2             3           = 4
             Dictionary<int, KeyValuePair<bool, object>?> AsCuffedByCustomRole = new();
@@ -387,11 +387,13 @@ public static void SummonSubclassApplier(Player Player, ICustomRole Role)
             // Now let's assign
             if (!player.IsDisarmed)
                 return Default;
-            else if (player.IsDisarmed && player.DisarmedBy is not null)
-                if (player.DisarmedBy.TryGetSummonedInstance(out SummonedCustomRole role) && AsCuffedByCustomRole.ContainsKey(role.Role.Id))
-                    return AsCuffedByCustomRole[role.Role.Id];
-                else if (AsCuffedByInternalTeam.ContainsKey(player.DisarmedBy.Team))
-                    return AsCuffedByInternalTeam[player.DisarmedBy.Team];
+            if (player.IsDisarmed && player.DisarmedBy is not null)
+                if (player.DisarmedBy.TryGetSummonedInstance(out SummonedCustomRole role) && AsCuffedByCustomRole.TryGetValue(role.Role.Id, out var crEscapeRole))
+                    return crEscapeRole;
+                else if (UCT.TryGetCustomTeamId(player.DisarmedBy, out uint uctTeamId) && AsCuffedByCustomTeam.TryGetValue(uctTeamId, out var uctEscapeRole))
+                    return uctEscapeRole;
+                else if (AsCuffedByInternalTeam.TryGetValue(player.DisarmedBy.Team, out var internalEscapeRole))
+                    return internalEscapeRole;
 
             LogManager.Silent($"Returing default type for escaping evaluation of player {player.PlayerId} who's cuffed by {player.DisarmedBy?.Team}");
             return Default;
@@ -411,10 +413,9 @@ public static void SummonSubclassApplier(Player Player, ICustomRole Role)
 
             if (Elements[0] is "CustomRole" || Elements[0] is "CR")
                 return new(true, int.Parse(Elements[1]));
-            else if ((Elements[0] is "InternalRole" || Elements[0] is "IR") && Enum.TryParse(Elements[1], out RoleTypeId role))
+            if ((Elements[0] is "InternalRole" || Elements[0] is "IR") && Enum.TryParse(Elements[1], out RoleTypeId role))
                 return new(false, role);
-            else
-                LogManager.Warn($"Function SpawnManager::ParseEscapeString(string escape) failed!\nPossible causes can be:\n- The source is not valid. Allowed: InternalRole / IR / CustomRole / CR. Found: {Elements[0]}\n- The target is not a CustomRole / InternalRole. Found: {Elements[1]} (int32: {int.Parse(Elements[1])}");
+            LogManager.Warn($"Function SpawnManager::ParseEscapeString(string escape) failed!\nPossible causes can be:\n- The source is not valid. Allowed: InternalRole / IR / CustomRole / CR. Found: {Elements[0]}\n- The target is not a CustomRole / InternalRole. Found: {Elements[1]} (int32: {int.Parse(Elements[1])}");
 
             return new(false, RoleTypeId.Spectator);
         }

UncomplicatedCustomRoles/Patches/TeamPatch.cs

@@ -8,25 +8,24 @@
  * If not, see <https://www.gnu.org/licenses/>.
  */
 
-using Achievements.Handlers;
-using HarmonyLib;
-using Interactables.Interobjects.DoorUtils;
-using InventorySystem.Items.ThrowableProjectiles;
-using PlayerRoles;
-using PlayerRoles.PlayableScps.Scp079.Rewards;
-using PlayerRoles.PlayableScps.Scp939.Mimicry;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using Achievements.Handlers;
+using HarmonyLib;
+using Interactables.Interobjects.DoorUtils;
 using InventorySystem.Disarming;
 using InventorySystem.Items;
+using InventorySystem.Items.ThrowableProjectiles;
 using InventorySystem.Searching;
-using LabApi.Features.Console;
 using MapGeneration.Distributors;
+using PlayerRoles;
+using PlayerRoles.PlayableScps.HumanTracker;
 using PlayerRoles.PlayableScps.Scp079;
+using PlayerRoles.PlayableScps.Scp079.Rewards;
+using PlayerRoles.PlayableScps.Scp939.Mimicry;
 using PlayerStatsSystem;
 using UncomplicatedCustomRoles.API.Features;
 using UncomplicatedCustomRoles.Manager;
@@ -37,12 +36,13 @@ namespace UncomplicatedCustomRoles.Patches
     [HarmonyPatch(typeof(PlayerRoleManager), nameof(PlayerRoleManager.CurrentRole), MethodType.Getter)]
     internal class PlayerRoleManagerPatch
     {
-        static bool Prefix(PlayerRoleManager __instance, ref PlayerRoleBase __result)
+        private static bool Prefix(PlayerRoleManager __instance, ref PlayerRoleBase __result)
         {
             if (__instance.Hub == null || __instance.Hub.netId == 0)
                 return true;
 
-            if (__instance.Hub is not null && DisguiseTeam.RoleBaseList.TryGetValue(__instance.Hub.PlayerId, out PlayerRoleBase role))
+            if (__instance.Hub is not null &&
+                DisguiseTeam.RoleBaseList.TryGetValue(__instance.Hub.PlayerId, out PlayerRoleBase role))
             {
                 if (role is null)
                     LogManager.Error($"Disguised role for player {__instance.Hub.PlayerId} is null!");
@@ -55,7 +55,7 @@ static bool Prefix(PlayerRoleManager __instance, ref PlayerRoleBase __result)
             return true;
         }
     }
-    
+
     [HarmonyPatch(typeof(PlayerRolesUtils), nameof(PlayerRolesUtils.GetRoleId))]
     internal class PlayerRolesUtilsPatch
     {
@@ -82,11 +82,11 @@ internal class PlayerRolesUtilsPatch
             $"{typeof(Scp079Recontainer)}::{nameof(Scp079Recontainer.OnServerRoleChanged)}"
         };
 
-        static bool Prefix(ReferenceHub hub, ref RoleTypeId __result)
+        private static bool Prefix(ReferenceHub hub, ref RoleTypeId __result)
         {
             if (hub == null)
                 return true;
-            
+
             if (!DisguiseTeam.List.TryGetValue(hub.PlayerId, out Team team))
                 return true;
 
@@ -118,21 +118,22 @@ static bool Prefix(ReferenceHub hub, ref RoleTypeId __result)
     [HarmonyPatch(typeof(ExplosionGrenade), nameof(ExplosionGrenade.ExplodeDestructible))]
     internal class GrenadeTranspiler
     {
-        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             List<CodeInstruction> newInstructions = new(instructions);
             int index = -1;
 
             for (int i = 0; i < newInstructions.Count; i++)
-            {
-                if (newInstructions[i].opcode == OpCodes.Call && newInstructions[i].operand is MethodInfo method && method == Method(typeof(PlayerRolesUtils), nameof(PlayerRolesUtils.GetRoleId), new Type[] { typeof(ReferenceHub) }))
+                if (newInstructions[i].opcode == OpCodes.Call && newInstructions[i].operand is MethodInfo method &&
+                    method == Method(typeof(PlayerRolesUtils), nameof(PlayerRolesUtils.GetRoleId),
+                        [typeof(ReferenceHub)]))
                 {
                     index = i;
                     break;
                 }
-            }
 
-            newInstructions[index+1].operand = Method(typeof(PlayerRolesUtils), nameof(PlayerRolesUtils.GetTeam), new Type[] { typeof(ReferenceHub) });
+            newInstructions[index + 1].operand = Method(typeof(PlayerRolesUtils), nameof(PlayerRolesUtils.GetTeam),
+                [typeof(ReferenceHub)]);
             newInstructions.RemoveAt(index);
 
             return newInstructions;
@@ -142,7 +143,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
     [HarmonyPatch(typeof(PickupSearchCompletor), nameof(PickupSearchCompletor.ValidateAny))]
     public class PickupSearchCompletorPatch
     {
-        static bool Prefix(PickupSearchCompletor __instance, ref bool __result)
+        private static bool Prefix(PickupSearchCompletor __instance, ref bool __result)
         {
             if (!DisguiseTeam.List.TryGetValue(__instance.Hub.PlayerId, out Team team) || team != Team.SCPs ||
                 __instance.Hub.roleManager.CurrentRole.RoleTypeId.GetTeam() == Team.SCPs) return true;
@@ -151,39 +152,49 @@ static bool Prefix(PickupSearchCompletor __instance, ref bool __result)
             return false;
         }
     }
-    
+
     [HarmonyPatch]
     public class DoorPermissionsPolicyPatch
     {
-        static MethodBase TargetMethod()
+        private static MethodBase TargetMethod()
         {
-            return Method(typeof(DoorPermissionsPolicy), "CheckPermissions", new[] { typeof(ReferenceHub), typeof(IDoorPermissionRequester), typeof(PermissionUsed).MakeByRefType() });
+            return Method(typeof(DoorPermissionsPolicy), "CheckPermissions",
+            [
+                typeof(ReferenceHub), typeof(IDoorPermissionRequester), typeof(PermissionUsed).MakeByRefType()
+            ]);
         }
 
-        static bool Prefix(DoorPermissionsPolicy __instance, ReferenceHub hub, IDoorPermissionRequester requester, out PermissionUsed callback, ref bool __result)
+        private static bool Prefix(DoorPermissionsPolicy __instance, ReferenceHub hub,
+            IDoorPermissionRequester requester,
+            out PermissionUsed callback, ref bool __result)
         {
             callback = null;
             if (__instance.RequiredPermissions == DoorPermissionFlags.None || hub.serverRoles.BypassMode)
             {
                 __result = true;
                 return false;
             }
+
             if (hub.roleManager.CurrentRole is IDoorPermissionProvider currentRole &&
                 (!DisguiseTeam.List.TryGetValue(hub.PlayerId, out Team team) || team != Team.SCPs))
             {
                 __result = __instance.CheckPermissions(currentRole, requester, out callback);
                 return false;
             }
+
             ItemBase curInstance = hub.inventory.CurInstance;
-            __result = curInstance != null && curInstance is IDoorPermissionProvider provider && __instance.CheckPermissions(provider, requester, out callback);
+            __result = curInstance != null && curInstance is IDoorPermissionProvider provider &&
+                       __instance.CheckPermissions(provider, requester, out callback);
             return false;
         }
     }
-    
-    [HarmonyPatch(typeof(DoorPermissionsPolicyExtensions), nameof(DoorPermissionsPolicyExtensions.GetCombinedPermissions))]
+
+    [HarmonyPatch(typeof(DoorPermissionsPolicyExtensions),
+        nameof(DoorPermissionsPolicyExtensions.GetCombinedPermissions))]
     public class DoorPermissionsPolicyExtensionsPatch
     {
-        static bool Prefix(ReferenceHub hub, IDoorPermissionRequester requester, ref DoorPermissionFlags __result)
+        private static bool Prefix(ReferenceHub hub, IDoorPermissionRequester requester,
+            ref DoorPermissionFlags __result)
         {
             if (hub == null)
             {
@@ -212,17 +223,51 @@ static bool Prefix(ReferenceHub hub, IDoorPermissionRequester requester, ref Doo
         }
     }
 
+    [HarmonyPatch(typeof(LastHumanTracker), nameof(LastHumanTracker.TryGetLastTarget))]
+    public class LastHumanTrackerPatch
+    {
+        private static bool Prefix(ref ReferenceHub lastTarget, ref bool __result)
+        {
+            lastTarget = null;
+            int humanCount = 0;
+            int scpCount = 0;
+
+            foreach (ReferenceHub hub in ReferenceHub.AllHubs)
+            {
+                Team effectiveTeam = hub.GetRoleId().GetTeam();
+                if (DisguiseTeam.List.TryGetValue(hub.PlayerId, out Team fakeTeam))
+                    effectiveTeam = fakeTeam;
+
+                if (effectiveTeam == Team.SCPs)
+                {
+                    ++scpCount;
+                }
+                else if (hub.IsAlive() && effectiveTeam != Team.Dead && effectiveTeam != Team.Dead)
+                {
+                    ++humanCount;
+                    lastTarget = hub;
+                }
+            }
+
+            __result = humanCount == 1 && scpCount > 0;
+            return false;
+        }
+    }
+
     [HarmonyPatch(typeof(Scp079Recontainer), nameof(Scp079Recontainer.OnServerRoleChanged))]
     public class Scp079RecontainerPatch
     {
-        static bool Prefix(Scp079Recontainer __instance, ReferenceHub hub, RoleTypeId newRole, RoleChangeReason reason)
+        private static bool Prefix(Scp079Recontainer __instance, ReferenceHub hub, RoleTypeId newRole,
+            RoleChangeReason reason)
         {
             Team team = hub.GetRoleId().GetTeam();
             if (DisguiseTeam.List.TryGetValue(hub.PlayerId, out Team t))
                 team = t;
-            Logger.Debug($"Player {hub.PlayerId} changed role to {newRole} for reason {reason}. Checking if recontainment is needed...");
-            Logger.Debug($"Player's current role: {hub.GetRoleId()}, team: {team}");
-            if (newRole != RoleTypeId.Spectator || !IsScpButNot079(hub.GetRoleId(), team) || Scp079Role.ActiveInstances.Count == 0 ||
+            LogManager.Debug(
+                $"Player {hub.PlayerId} changed role to {newRole} for reason {reason}. Checking if recontainment is needed...");
+            LogManager.Debug($"Player's current role: {hub.GetRoleId()}, team: {team}");
+            if (newRole != RoleTypeId.Spectator || !IsScpButNot079(hub.GetRoleId(), team) ||
+                Scp079Role.ActiveInstances.Count == 0 ||
                 ReferenceHub.AllHubs.Any(x =>
                 {
                     if (x == hub)
@@ -244,7 +289,7 @@ static bool Prefix(Scp079Recontainer __instance, ReferenceHub hub, RoleTypeId ne
 
         private static bool IsScpButNot079(RoleTypeId roleTypeId, Team team)
         {
-            Logger.Debug($"Checking if role {roleTypeId} is an SCP but not 079 for team {team}");
+            LogManager.Debug($"Checking if role {roleTypeId} is an SCP but not 079 for team {team}");
             return team == Team.SCPs && roleTypeId != RoleTypeId.Scp079;
         }
     }

UncomplicatedCustomRoles/Plugin.cs

@@ -36,7 +36,7 @@ internal class Plugin : Plugin<Config>
 
         public override string Author => "FoxWorn3365, Dr.Agenda, MedveMarci";
 
-        public override Version Version { get; } = new(9, 4, 0, 0);
+        public override Version Version { get; } = new(9, 5, 0, 0);
 
         public override Version RequiredApiVersion => new(LabApiProperties.CompiledVersion);
 

UncomplicatedCustomRoles/UncomplicatedCustomRoles.csproj

@@ -30,9 +30,9 @@
 
     <ItemGroup>
         <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3" PrivateAssets="all"/>
-        <PackageReference Include="Lib.Harmony" Version="2.4.2"/>
-        <PackageReference Include="Northwood.LabAPI" Version="1.1.6.1"/>
-        <PackageReference Include="System.Text.Json" Version="10.0.7"/>
+        <PackageReference Include="Lib.Harmony" Version="2.2.2" />
+        <PackageReference Include="Northwood.LabAPI" Version="1.1.7" />
+        <PackageReference Include="System.Text.Json" Version="10.0.8" />
         <PackageReference Include="System.ComponentModel" Version="4.3.0"/>
         <PackageReference Include="System.Net.Http" Version="4.3.4"/>
         <PackageReference Include="YamlDotNet" Version="11.0.1"/>