feat: expose player facility zones in properties and filters

Author: Elektryk-Andrzej

Code/ValueSystem/PlayerValue.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using CustomPlayerEffects;
 using LabApi.Features.Wrappers;
+using MapGeneration;
 using PlayerRoles;
 using PlayerRoles.FirstPersonControl;
 using PlayerRoles.FirstPersonControl.Thirdperson.Subcontrollers;
@@ -28,7 +29,7 @@ public PlayerValue(IEnumerable<Player> players)
     {
         Players = players.ToArray();
     }
-    
+
     public PlayerValue()
     {
         Players = [];
@@ -44,9 +45,9 @@ public PlayerValue()
     public new static string FriendlyName => "player value";
 
     private static Dictionary<string, IValueWithProperties.PropInfo>? _properties;
-    public Dictionary<string, IValueWithProperties.PropInfo> Properties => _properties ??= 
+    public Dictionary<string, IValueWithProperties.PropInfo> Properties => _properties ??=
         PropertyInfoMap.ToDictionary(pair => pair.Key.ToString().LowerFirst(), pair => pair.Value, StringComparer.OrdinalIgnoreCase)
-            .Append(new KeyValuePair<string, IValueWithProperties.PropInfo>("valType", 
+            .Append(new KeyValuePair<string, IValueWithProperties.PropInfo>("valType",
                 new IValueWithProperties.PropInfo<PlayerValue, EnumValue<ValueType>>(_ => ValueType.Player, "The type of the value")))
             .ToDictionary(pair => pair.Key, pair => pair.Value, StringComparer.OrdinalIgnoreCase);
 
@@ -116,13 +117,14 @@ public enum PlayerProperty
         Unit,
         CRole,
         IsTransmitting,
-        HasRemoteAdminAccess
+        HasRemoteAdminAccess,
+        Zone
     }
 
     private class Info<T>(Func<Player, T> handler, string? description)
         : IValueWithProperties.PropInfo<Player, T>(handler, description) where T : Value
     {
-        protected override Func<object, object>? Translator { get; } = 
+        protected override Func<object, object>? Translator { get; } =
             obj => obj is PlayerValue { Players.Length: 1 } val ? val.Players[0] : obj;
     }
 
@@ -235,7 +237,8 @@ private class Info<T>(Func<Player, T> handler, string? description)
         [PlayerProperty.Unit] = new Info<TextValue>(plr => NamingRulesManager.ClientFetchReceived(plr.Team, plr.UnitId).ToStaticTextValue(), "Returns the player's unit (e.g FOXTROT-03) if player is NTF or Facility Guard, otherwise returns an empty text value."),
         [PlayerProperty.CRole] = new Info<ReferenceValue<CRole>>(plr => CRole.LifeIdAssignedRoles.TryGetValue(plr.LifeId, out var role) ? role : null, "Returns the player's CRole if player has a Custom Role, otherwise returns an invalid reference."),
         [PlayerProperty.IsTransmitting] = new Info<BoolValue>(plr => PersonalRadioPlayback.IsTransmitting(plr.ReferenceHub), "Returns true if player is speaking through a radio, otherwise false."),
-        [PlayerProperty.HasRemoteAdminAccess] = new Info<BoolValue>(plr => plr.RemoteAdminAccess, null)
+        [PlayerProperty.HasRemoteAdminAccess] = new Info<BoolValue>(plr => plr.RemoteAdminAccess, null),
+        [PlayerProperty.Zone] = new Info<EnumValue<FacilityZone>>(plr => plr.Zone, "The facility zone the player is in.")
     };
 
     public override TryGet<object> ToCSharpObject(Type? targetType)
@@ -263,4 +266,4 @@ IEnumerator IEnumerable.GetEnumerator()
     {
         return GetEnumerator();
     }
-}
+}

VS Code Extension/out/ser-language.json

@@ -2515,7 +2515,8 @@
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,
@@ -3904,7 +3905,8 @@
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,

VS Code Extension/out/visual-editor.html

@@ -6156,7 +6156,8 @@ <h1 id="recipeTitle">What do you want to make?</h1>
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,
@@ -7545,7 +7546,8 @@ <h1 id="recipeTitle">What do you want to make?</h1>
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,

website/data/ser-truth-table.json

@@ -2515,7 +2515,8 @@
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,
@@ -3904,7 +3905,8 @@
             "Unit",
             "CRole",
             "IsTransmitting",
-            "HasRemoteAdminAccess"
+            "HasRemoteAdminAccess",
+            "Zone"
           ],
           "enumDescription": null,
           "enumDescriptions": null,