Adding support for CustomRoles

ExMod-Team · Aug 26, 2024 · 7cf5ee0 · 7cf5ee0
1 parent 0ff63f1
commit 7cf5ee0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/EXILED/Exiled.CustomItems/Commands/Info.cs b/EXILED/Exiled.CustomItems/Commands/Info.cs
@@ -68,14 +68,23 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 .Append("- ").AppendLine(item?.Description)
                 .AppendLine(item?.Type.ToString())
                 .Append("- Spawn Limit: ").AppendLine(item?.SpawnProperties?.Limit.ToString()).AppendLine()
-                .Append("[Spawn Locations (").Append(item?.SpawnProperties?.DynamicSpawnPoints.Count + item?.SpawnProperties?.StaticSpawnPoints.Count).AppendLine(")]");
+                .Append("[Spawn Locations (").Append(item?.SpawnProperties?.Count()).AppendLine(")]");
 
             foreach (DynamicSpawnPoint spawnPoint in item?.SpawnProperties?.DynamicSpawnPoints!)
                 message.Append(spawnPoint.Name).Append(' ').Append(spawnPoint.Position).Append(" Chance: ").Append(spawnPoint.Chance).AppendLine("%");
 
             foreach (StaticSpawnPoint spawnPoint in item.SpawnProperties.StaticSpawnPoints)
                 message.Append(spawnPoint.Name).Append(' ').Append(spawnPoint.Position).Append(" Chance: ").Append(spawnPoint.Chance).AppendLine("%");
 
+            foreach (RoleSpawnPoint spawnPoint in item.SpawnProperties.RoleSpawnPoints)
+                message.Append(spawnPoint.Name).Append(' ').Append(spawnPoint.Position).Append(" Chance: ").Append(spawnPoint.Chance).AppendLine("%");
+
+            foreach (LockerSpawnPoint spawnPoint in item.SpawnProperties.LockerSpawnPoints)
+                message.Append(spawnPoint.Name).Append(' ').Append(spawnPoint.Position).Append(" Chance: ").Append(spawnPoint.Chance).AppendLine("%");
+
+            foreach (RoomSpawnPoint spawnPoint in item.SpawnProperties.RoomSpawnPoints)
+                message.Append(spawnPoint.Name).Append(' ').Append(spawnPoint.Position).Append(" Chance: ").Append(spawnPoint.Chance).AppendLine("%");
+
             response = StringBuilderPool.Pool.ToStringReturn(message);
             return true;
         }

diff --git a/EXILED/Exiled.CustomItems/CustomItems.cs b/EXILED/Exiled.CustomItems/CustomItems.cs
@@ -19,7 +19,7 @@ namespace Exiled.CustomItems
     /// </summary>
     public class CustomItems : Plugin<Config>
     {
-        private RoundHandler? roundHandler;
+        private MapHandler? roundHandler;
         private PlayerHandler? playerHandler;
         private Harmony? harmony;
 
@@ -32,7 +32,7 @@ public class CustomItems : Plugin<Config>
         public override void OnEnabled()
         {
             Instance = this;
-            roundHandler = new RoundHandler();
+            roundHandler = new MapHandler();
             playerHandler = new PlayerHandler();
 
             Exiled.Events.Handlers.Map.Generated += roundHandler.OnMapGenerated;

diff --git a/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs b/EXILED/Exiled.CustomRoles/API/Features/CustomRole.cs
@@ -840,6 +840,16 @@ protected Vector3 GetSpawnPosition()
                 }
             }
 
+            if (SpawnProperties.RoomSpawnPoints.Count > 0)
+            {
+                foreach ((float chance, Vector3 pos) in SpawnProperties.RoomSpawnPoints)
+                {
+                    double r = Loader.Random.NextDouble() * 100;
+                    if (r <= chance)
+                        return pos;
+                }
+            }
+
             return Vector3.zero;
         }