Fixed UCR

Author: MedveMarci

UncomplicatedCustomEscapeZones/Events/EventHandler.cs

@@ -9,6 +9,7 @@
 using UncomplicatedEscapeZones.Interfaces;
 using UncomplicatedEscapeZones.Intergrations;
 using UncomplicatedEscapeZones.Managers;
+using UnityEngine;
 
 namespace UncomplicatedEscapeZones.Events;
 
@@ -58,16 +59,29 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
                     if (role is not RoleTypeId.None)
                     {
                         ev.NewRole = role;
-                        ev.IsAllowed = true;
                         if (ev.EscapeScenario == Escape.EscapeScenarioType.None)
                             ev.EscapeScenario = Escape.EscapeScenarioType.Custom;
+                        
+                        if (UCR.TryGetSummonedCustomRole(ev.Player, out _))
+                        {
+                            ev.IsAllowed = false;
+                            ev.Player.ConnectionToClient.Send(new Escape.EscapeMessage
+                            {
+                                ScenarioId = (byte) ev.EscapeScenario,
+                                EscapeTime = (ushort) Mathf.CeilToInt(ev.Player.RoleBase.ActiveTime)
+                            });
+                            ev.Player.SetRole(ev.NewRole, RoleChangeReason.Escaped);
+                            return;
+                        }
+                        
+                        ev.IsAllowed = true;
                         LogManager.Debug($"Player {ev.Player.Nickname} will respawn as {role}!");
                     }
             }
             else
             {
-                LogManager.Debug($"Trying to find CustomRole with Id {newRoleValue.Key}");
-                if (int.TryParse(newRoleValue.Key.ToString(), out int id) && UCR.TryGetCustomRole(id, out object _))
+                LogManager.Debug($"Trying to find CustomRole with Id {newRoleValue.Value}");
+                if (int.TryParse(newRoleValue.Value.ToString(), out int id) && UCR.TryGetCustomRole(id, out object _))
                 {
                     LogManager.Debug("Role found!");
                     ev.IsAllowed = false;
@@ -79,12 +93,10 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
                         UCR.GiveCustomRole(id, ev.Player);
                         LogManager.Debug(
                             $"Successfully called method SpawnManager::SummonCustomSubclass(<...>) for player {ev.Player.Nickname}!");
+                        return;
                     }
-                    else
-                    {
-                        LogManager.Debug(
-                            "Canceled call to method SpawnManager::SummonCustomSubclass(<...>) due to the presence of the player inside the Escape::Bucket! - Event already fired!");
-                    }
+                    LogManager.Debug(
+                        "Canceled call to method SpawnManager::SummonCustomSubclass(<...>) due to the presence of the player inside the Escape::Bucket! - Event already fired!");
                 }
             }
         }

UncomplicatedCustomEscapeZones/Managers/EscapeManager.cs

@@ -10,7 +10,7 @@
 
 namespace UncomplicatedEscapeZones.Managers;
 
-public class EscapeManager
+public static class EscapeManager
 {
     public static KeyValuePair<bool, object?>? ParseEscapeRole(
         Dictionary<string, List<Dictionary<string, string>>> roleAfterEscape, Player player)
@@ -103,22 +103,33 @@ public class EscapeManager
 
                     LogManager.Debug($"Parsing escape condition: {kvp.Key} -> {kvp.Value}");
 
-                    switch (elements[2])
+                    switch (elements[2].ToLowerInvariant())
                     {
-                        case "InternalFaction" or "IF" when Enum.TryParse(elements[3], out Faction faction):
-                            asCuffedByInternalFaction.TryAdd(faction, data);
+                        case "internalfaction" or "if":
+                            if (Enum.TryParse(elements[3], true, out Faction faction))
+                                asCuffedByInternalFaction.TryAdd(faction, data);
+                            else
+                                LogManager.Warn($"Failed to parse faction '{elements[3]}' for escape condition '{kvp.Key}'.");
                             break;
-                        case "InternalTeam" or "IT" when Enum.TryParse(elements[3], out Team team):
-                            asCuffedByInternalTeam.TryAdd(team, data);
+                        case "internalteam" or "it":
+                            if (Enum.TryParse(elements[3], true, out Team team))
+                                asCuffedByInternalTeam.TryAdd(team, data);
+                            else
+                                LogManager.Warn($"Failed to parse team '{elements[3]}' for escape condition '{kvp.Key}'.");
                             break;
-                        case "InternalRole" or "IR" when Enum.TryParse(elements[3], out RoleTypeId id):
-                            asCuffedByInternalRole.TryAdd(id, data);
+                        case "internalrole" or "ir":
+                            if (Enum.TryParse(elements[3], true, out RoleTypeId id))
+                                asCuffedByInternalRole.TryAdd(id, data);
+                            else
+                                LogManager.Warn($"Failed to parse role '{elements[3]}' for escape condition '{kvp.Key}'.");
                             break;
-                        case "CustomRole" or "CR"
-                            when int.TryParse(elements[3], out int id) && UCR.TryGetCustomRole(id, out _):
-                            asCuffedByCustomRole.TryAdd(id, data);
+                        case "customrole" or "cr":
+                            if (int.TryParse(elements[3], out int cid) && UCR.TryGetCustomRole(cid, out _))
+                                asCuffedByCustomRole.TryAdd(cid, data);
+                            else
+                                LogManager.Warn($"Failed to parse custom role id '{elements[3]}' for escape condition '{kvp.Key}'.");
                             break;
-                        case "all" or "ALL":
+                        case "all":
                             defaultCuffedValue = data;
                             break;
                         default:

UncomplicatedCustomEscapeZones/Plugin.cs

@@ -23,7 +23,7 @@ internal class Plugin : Plugin<Config>
     public override string Name => "UncomplicatedCustomEscapeZones";
     public override string Description => "Customize your SCP:SL server with Custom Escape Zones!";
     public override string Author => "MedveMarci & FoxWorn3365";
-    public override Version Version => new(1, 1, 0, 0);
+    public override Version Version => new(1, 2, 0, 0);
     public override Version RequiredApiVersion { get; } = new(LabApiProperties.CompiledVersion);
     public override LoadPriority Priority => LoadPriority.Highest;