Merge pull request #7 from UncomplicatedCustomServer/dev-labapi

MedveMarci · web-flow · commit ec54bb0ea55b · 2025-09-28T22:08:45.000+02:00
UCEZ v1.1.0 - InternalFaction support
diff --git a/UncomplicatedCustomEscapeZones/API/Features/CustomEscapeZone.cs b/UncomplicatedCustomEscapeZones/API/Features/CustomEscapeZone.cs
@@ -51,7 +51,7 @@ public class CustomEscapeZone : ICustomEscapeZone
                     new Dictionary<string, string>
                     {
                         { "default", "InternalRole ChaosRepressor" },
-                        { "cuffed by InternalTeam FoundationForces", "InternalRole NtfPrivate" }
+                        { "cuffed by InternalFaction FoundationForces", "InternalRole NtfPrivate" }
                     }
                 ]
             },
@@ -60,7 +60,7 @@ public class CustomEscapeZone : ICustomEscapeZone
                     new Dictionary<string, string>
                     {
                         { "default", "InternalRole NtfSpecialist" },
-                        { "cuffed by InternalTeam ChaosInsurgency", "InternalRole ChaosRepressor" }
+                        { "cuffed by InternalFaction FoundationEnemy", "InternalRole ChaosRepressor" }
                     }
                 ]
             }
diff --git a/UncomplicatedCustomEscapeZones/Commands/CommandParent.cs b/UncomplicatedCustomEscapeZones/Commands/CommandParent.cs
@@ -28,7 +28,7 @@ public sealed override void LoadGeneratedCommands()
     {
         RegisteredCommands.Add(new Reload());
         RegisteredCommands.Add(new Outline());
-        RegisteredCommands.Add(new GetData());
+        RegisteredCommands.Add(new GetPosition());
     }
 
     protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
diff --git a/UncomplicatedCustomEscapeZones/Commands/GetPosition.cs b/UncomplicatedCustomEscapeZones/Commands/GetPosition.cs
@@ -7,13 +7,13 @@
 
 namespace UncomplicatedEscapeZones.Commands;
 
-public class GetData : IUCEZCommand
+public class GetPosition : IUCEZCommand
 {
-    public string Name { get; } = "getdata";
+    public string Name { get; } = "getposition";
 
     public string Description { get; } = "Gets the current position from the Room's origin and the Room's name.";
 
-    public string RequiredPermission { get; } = "ucez.getdata";
+    public string RequiredPermission { get; } = "ucez.getposition";
 
     public bool Executor(List<string> arguments, ICommandSender sender, out string response)
     {
diff --git a/UncomplicatedCustomEscapeZones/Events/EventHandler.cs b/UncomplicatedCustomEscapeZones/Events/EventHandler.cs
@@ -25,6 +25,7 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
             {
                 LogManager.Debug($"Player {ev.Player.Nickname} evaluated for a natural respawn Reason: No RoleAfterEscape configured! {ev.EscapeScenario}");
                 ev.IsAllowed = true;
+                base.OnPlayerEscaping(ev);
                 return;
             }
 
@@ -33,17 +34,20 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
 
             if (newRole is null)
             {
-                ev.IsAllowed = false;
-                LogManager.Debug($"Player {ev.Player.Nickname} has no role to be assigned after escaping!");
+                ev.IsAllowed = true;
+                LogManager.Warn($"Player {ev.Player.Nickname} evaluated for a natural respawn Reason: Player has no role to be assigned after escaping!");
+                base.OnPlayerEscaping(ev);
                 return;
             }
 
+            // bool: isCustomRole | object: RoleTypeId or CustomRoleId
             KeyValuePair<bool, object> newRoleValue = (KeyValuePair<bool, object>)newRole;
 
             if (newRoleValue.Value is null)
             {
                 ev.IsAllowed = true;
-                LogManager.Debug($"Player {ev.Player.Nickname} evaluated for a natural respawn! {ev.EscapeScenario}");
+                LogManager.Debug($"Player {ev.Player.Nickname} evaluated for a natural respawn! Reason: RoleAfterEscape returned null! {ev.EscapeScenario}");
+                base.OnPlayerEscaping(ev);
                 return;
             }
 
@@ -57,7 +61,7 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
                         ev.IsAllowed = true;
                         if (ev.EscapeScenario == Escape.EscapeScenarioType.None)
                             ev.EscapeScenario = Escape.EscapeScenarioType.Custom;
-                        LogManager.Debug($"Player {ev.Player.Nickname} will respawn as {role})!");
+                        LogManager.Debug($"Player {ev.Player.Nickname} will respawn as {role}!");
                     }
             }
             else
@@ -110,13 +114,15 @@ public override void OnServerWaitingForPlayers()
 
         foreach (ICustomEscapeZone customEscapeZone in CustomEscapeZone.List) new SummonedEscapeZone(customEscapeZone);
 
-        if (!Plugin.Instance.Config.EnableBasicLogs) return;
-        LogManager.Info(
-            $"Thanks for using UncomplicatedCustomEscapeZones v{Plugin.Instance.Version.ToString(3)} by {Plugin.Instance.Author}! Note that if you're using UCR, this plugin is the higher priority.",
-            ConsoleColor.Blue);
-        LogManager.Info(
-            "To receive support and to stay up-to-date, join our official Discord server: https://discord.gg/5StRGu8EJV",
-            ConsoleColor.DarkYellow);
+        if (Plugin.Instance.Config.EnableBasicLogs)
+        {
+            LogManager.Info(
+                $"Thanks for using UncomplicatedCustomEscapeZones v{Plugin.Instance.Version.ToString(3)} by {Plugin.Instance.Author}! Note that if you're using UCR, this plugin is the higher priority.",
+                ConsoleColor.Blue);
+            LogManager.Info(
+                "To receive support and to stay up-to-date, join our official Discord server: https://discord.gg/5StRGu8EJV",
+                ConsoleColor.DarkYellow);
+        }
 
         base.OnServerWaitingForPlayers();
     }
diff --git a/UncomplicatedCustomEscapeZones/Managers/EscapeManager.cs b/UncomplicatedCustomEscapeZones/Managers/EscapeManager.cs
@@ -18,11 +18,13 @@ public class EscapeManager
         // Determine which role-specific configuration applies to this player
         string playerRoleKey = player.Role.ToString();
         string playerTeamKey = player.Team.ToString();
+        string playerFactionKey = player.Faction.ToString();
         
         LogManager.Debug($"Player Role: {playerRoleKey}");
         LogManager.Debug($"Player Team: {playerTeamKey}");
+        LogManager.Debug($"Player Faction: {playerFactionKey}");
         
-        if (string.IsNullOrWhiteSpace(playerRoleKey) || string.IsNullOrWhiteSpace(playerTeamKey))
+        if (string.IsNullOrWhiteSpace(playerRoleKey) || string.IsNullOrWhiteSpace(playerTeamKey) || string.IsNullOrWhiteSpace(playerFactionKey))
         {
             LogManager.Warn(
                 $"Unable to determine player's role or team for escape evaluation (PlayerId={player.PlayerId}). Allowing natural escape.");
@@ -33,6 +35,8 @@ public class EscapeManager
             roleAfterEscape,
             $"InternalTeam {playerTeamKey}",
             $"IT {playerRoleKey}",
+            $"InternalFaction {playerFactionKey}",
+            $"IF {playerFactionKey}",
             playerRoleKey);
         
         if (UCR.TryGetSummonedCustomRole(player, out object summonedPlayer))
@@ -62,6 +66,7 @@ public class EscapeManager
         LogManager.Debug($"Found {entries.Count} RoleAfterEscape entries for role '{playerRoleKey}'.");
 
         Dictionary<Team, KeyValuePair<bool, object?>?> asCuffedByInternalTeam = new();
+        Dictionary<Faction, KeyValuePair<bool, object?>?> asCuffedByInternalFaction = new();
         Dictionary<RoleTypeId, KeyValuePair<bool, object?>?> asCuffedByInternalRole = new();
         // Dictionary<uint, KeyValuePair<bool, object?>?> asCuffedByCustomTeam = new(); we will add the support to UCT and UIU-RS
         Dictionary<int, KeyValuePair<bool, object?>?> asCuffedByCustomRole = new();
@@ -89,13 +94,16 @@ public class EscapeManager
                     {
                         LogManager.Warn(
                             $"Failed to parse an EscapeRole[key]: syntax should be cuffed by <source> <id>, found {elements.Count} args!\nSource: {kvp.Key}");
-                        return new KeyValuePair<bool, object?>(false, RoleTypeId.Spectator);
+                        return new KeyValuePair<bool, object?>(false, null);
                     }
 
                     LogManager.Debug($"Parsing escape condition: {kvp.Key} -> {kvp.Value}");
 
                     switch (elements[2])
                     {
+                        case "InternalFaction" or "IF" when Enum.TryParse(elements[3], out Faction faction):
+                            asCuffedByInternalFaction.TryAdd(faction, data);
+                            break;
                         case "InternalTeam" or "IT" when Enum.TryParse(elements[3], out Team team):
                             asCuffedByInternalTeam.TryAdd(team, data);
                             break;
@@ -110,7 +118,7 @@ when int.TryParse(elements[3], out int id) && UCR.TryGetCustomRole(id, out _):
                         {
                             bool okInt = int.TryParse(elements[3], out _);
                             LogManager.Warn(
-                                $"Function SpawnManager::ParseEscapeRole[2](<...>) failed!\nPossible causes can be:\n- The source is not valid. Allowed: InternalTeam / IT / CustomRole / CR. Found: {elements[2]}\n- The target is not a CustomRole / InternalRole. Found: {elements[3]} (int32 parsable: {okInt})");
+                                $"Function SpawnManager::ParseEscapeRole[2](<...>) failed!\nPossible causes can be:\n- The source is not valid. Allowed: InternalTeam / IT / InternalFaction / IF / CustomRole / CR. Found: {elements[2]}\n- The target is not a CustomRole / InternalRole. Found: {elements[3]} (int32 parsable: {okInt})");
                             break;
                         }
                     }
@@ -141,10 +149,13 @@ when int.TryParse(elements[3], out int id) && UCR.TryGetCustomRole(id, out _):
 
             if (asCuffedByInternalTeam.TryGetValue(player.DisarmedBy.Team, out KeyValuePair<bool, object?>? teamValue) && teamValue is not null)
                 return teamValue;
+            
+            if (asCuffedByInternalFaction.TryGetValue(player.DisarmedBy.Faction, out KeyValuePair<bool, object?>? factionValue) && factionValue is not null)
+                return factionValue;
         }
 
         LogManager.Debug(
-            $"Returing default type for escaping evaluation of player {player.PlayerId} who's cuffed by {player.DisarmedBy?.Team}");
+            $"Returing default type for escaping evaluation of player {player.PlayerId} who's cuffed by team: {player.DisarmedBy?.Team} faction: {player.DisarmedBy?.Faction} role: {player.DisarmedBy?.Role}");
         return defaultValue;
         
         // Local function to resolve entries with case-insensitive keys
diff --git a/UncomplicatedCustomEscapeZones/Plugin.cs b/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, 0, 1, 0);
+    public override Version Version => new(1, 1, 0, 0);
     public override Version RequiredApiVersion { get; } = new(LabApiProperties.CompiledVersion);
     public override LoadPriority Priority => LoadPriority.Highest;
 
diff --git a/UncomplicatedCustomEscapeZones/UncomplicatedCustomEscapeZones.csproj b/UncomplicatedCustomEscapeZones/UncomplicatedCustomEscapeZones.csproj
@@ -54,7 +54,7 @@
         <Reference Include="Mirror" HintPath="$(sl_references)\Mirror.dll"/>
         <Reference Include="UnityEngine.CoreModule" HintPath="$(sl_references)\UnityEngine.CoreModule.dll"/>
         <PackageReference Include="Newtonsoft.Json">
-            <Version>13.0.3</Version>
+            <Version>13.0.4</Version>
         </PackageReference>
         <PackageReference Include="System.ComponentModel">
             <Version>4.3.0</Version>
@@ -81,7 +81,7 @@
         <Compile Include="API\Features\SummonedEscapeZone.cs"/>
         <Compile Include="API\Struct\Triplet.cs"/>
         <Compile Include="Commands\CommandParent.cs"/>
-        <Compile Include="Commands\GetData.cs"/>
+        <Compile Include="Commands\GetPosition.cs" />
         <Compile Include="Commands\Outline.cs"/>
         <Compile Include="Commands\Reload.cs"/>
         <Compile Include="Config.cs"/>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class CustomEscapeZone : ICustomEscapeZone`
`51`	`51`	`new Dictionary<string, string>`
`52`	`52`	`{`
`53`	`53`	`{ "default", "InternalRole ChaosRepressor" },`
`54`		`- { "cuffed by InternalTeam FoundationForces", "InternalRole NtfPrivate" }`
	`54`	`+ { "cuffed by InternalFaction FoundationForces", "InternalRole NtfPrivate" }`
`55`	`55`	`}`
`56`	`56`	`]`
`57`	`57`	`},`
`@@ -60,7 +60,7 @@ public class CustomEscapeZone : ICustomEscapeZone`
`60`	`60`	`new Dictionary<string, string>`
`61`	`61`	`{`
`62`	`62`	`{ "default", "InternalRole NtfSpecialist" },`
`63`		`- { "cuffed by InternalTeam ChaosInsurgency", "InternalRole ChaosRepressor" }`
	`63`	`+ { "cuffed by InternalFaction FoundationEnemy", "InternalRole ChaosRepressor" }`
`64`	`64`	`}`
`65`	`65`	`]`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public sealed override void LoadGeneratedCommands()`
`28`	`28`	`{`
`29`	`29`	`RegisteredCommands.Add(new Reload());`
`30`	`30`	`RegisteredCommands.Add(new Outline());`
`31`		`- RegisteredCommands.Add(new GetData());`
	`31`	`+ RegisteredCommands.Add(new GetPosition());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`
`8`	`8`	`namespace UncomplicatedEscapeZones.Commands;`
`9`	`9`
`10`		`-public class GetData : IUCEZCommand`
	`10`	`+public class GetPosition : IUCEZCommand`
`11`	`11`	`{`
`12`		`- public string Name { get; } = "getdata";`
	`12`	`+ public string Name { get; } = "getposition";`
`13`	`13`
`14`	`14`	`public string Description { get; } = "Gets the current position from the Room's origin and the Room's name.";`
`15`	`15`
`16`		`- public string RequiredPermission { get; } = "ucez.getdata";`
	`16`	`+ public string RequiredPermission { get; } = "ucez.getposition";`
`17`	`17`
`18`	`18`	`public bool Executor(List<string> arguments, ICommandSender sender, out string response)`
`19`	`19`	`{`