added IgnoredRoles config to fix an issue with effect #18

Mikihero · Oct 8, 2023 · 414af50 · 414af50
1 parent aacf642
commit 414af50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/BetterCoinflips/Configs/Config.cs b/BetterCoinflips/Configs/Config.cs
@@ -100,6 +100,14 @@ public class Config : IConfig
             RoleTypeId.Scp939,
         };
 
+        [Description("List of ignored roles for the PlayerSwapEffect (#18)")]
+        public List<RoleTypeId> IgnoredRoles = new()
+        {
+            RoleTypeId.Spectator,
+            RoleTypeId.Filmmaker,
+            RoleTypeId.Overwatch,
+        };
+
         [Description("The chance of these good effects happening. It's a proportional chance not a % chance.")]
         public int KeycardChance { get; set; } = 20;
         public int MedicalKitChance { get; set; } = 35;

diff --git a/BetterCoinflips/Plugin.cs b/BetterCoinflips/Plugin.cs
@@ -10,7 +10,7 @@ public class Plugin : Plugin<Config, Configs.Translations>
     {
         public static Plugin Instance;
         public override Version RequiredExiledVersion => new(8, 2, 1, 0);
-        public override Version Version => new(4, 2, 0);
+        public override Version Version => new(4, 2, 1, 0);
         public override string Author => "Miki_hero";
         public override string Name => "BetterCoinflips";
         public override string Prefix => "better_cf";

diff --git a/BetterCoinflips/Types/CoinEffect.cs b/BetterCoinflips/Types/CoinEffect.cs
@@ -19,8 +19,8 @@ namespace BetterCoinflips.Types
 {
     public class CoinFlipEffect
     {
-        private static readonly Config Cfg = Plugin.Instance.Config;
-        private static readonly Configs.Translations Translations = Plugin.Instance.Translation;
+        private static Config Cfg => Plugin.Instance.Config;
+        private static Configs.Translations Translations => Plugin.Instance.Translation;
         private static readonly System.Random Rd = new();
 
         public Action<Player> Execute { get; set; }
@@ -332,7 +332,7 @@ public CoinFlipEffect(Action<Player> execute, string message)
             //17
             new CoinFlipEffect(player =>
             {
-                var playerList = Player.List.Where(x => x.Role.Type != RoleTypeId.Spectator).ToList();
+                var playerList = Player.List.Where(x => !Cfg.IgnoredRoles.Contains(x.Role.Type)).ToList();
                 playerList.Remove(player);
                 if (playerList.IsEmpty())
                 {