Merge branch 'dev' into meeting-abilities

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs

@@ -476,6 +476,10 @@ public static class RoleSettingMenuPatches
             if (role.Configuration.CanModifyChance)
             {
                 role.SetChance(roleSetting.RoleChance);
+                if (roleSetting.RoleChance == 0 && role.Configuration.MaxRoleCount != 0)
+                {
+                    role.SetCount(0);
+                }
             }
         }
         catch (Exception e)

MiraAPI/Roles/ICustomRole.cs

@@ -128,6 +128,10 @@ public interface ICustomRole : IOptionable
         if (presetConfig.TryGetEntry(ChanceConfigDefinition, out ConfigEntry<int> chanceEntry))
         {
             SetChance(chanceEntry.Value);
+            if (chanceEntry.Value == 0)
+            {
+                SetCount(0);
+            }
         }
     }
 
@@ -156,6 +160,10 @@ public interface ICustomRole : IOptionable
     /// <returns>The role count option.</returns>
     public virtual int? GetCount()
     {
+        if (ParentMod.PluginConfig.TryGetEntry(ChanceConfigDefinition, out ConfigEntry<int> entry2) && entry2.Value == 0)
+        {
+            return 0;
+        }
         if (ParentMod.PluginConfig.TryGetEntry(NumConfigDefinition, out ConfigEntry<int> entry))
         {
             return Mathf.Clamp(entry.Value, 0, Configuration.MaxRoleCount);