Refactor PartyModes in preparation for a more unified name selection and maybe config

PartyModes/PartyModeChallenge/CChallengeRounds.cs

@@ -92,7 +92,7 @@ namespace VocaluxeLib.PartyModes.Challenge
             {
                 if (roundIndex == 0 || numPlayed[i] < max)
                 {
-                    if (roundIndex == 0 || roundIndex > 0 && numPlayed[i] < max && !Rounds[roundIndex - 1].IsAvailable(i))
+                    if (roundIndex == 0 || roundIndex > 0 && numPlayed[i] < max && !Rounds[roundIndex - 1].Contains(i))
                         result.Add(i);
                     else if (numPlayed[i] < max)
                         other.Add(i);
@@ -101,7 +101,7 @@ namespace VocaluxeLib.PartyModes.Challenge
                 {
                     if (roundIndex > 0)
                     {
-                        if (!Rounds[roundIndex - 1].IsAvailable(i))
+                        if (!Rounds[roundIndex - 1].Contains(i))
                             other.Add(i);
                         else
                             last.Add(i);
@@ -165,11 +165,11 @@ namespace VocaluxeLib.PartyModes.Challenge
             //filter against PlayerNrDemand
             List<CCombination> combsFiltered = new List<CCombination>();
             if (playerNrDemand != null)
-                combsFiltered.AddRange(_Combs.Where(t => t.IsAvailableAll(playerNrDemand)));
+                combsFiltered.AddRange(_Combs.Where(t => t.ContainsAll(playerNrDemand)));
 
             //1st fallback
             if (playerNrDemand != null && combsFiltered.Count == 0)
-                combsFiltered.AddRange(_Combs.Where(t => t.IsAvailableSomeone(playerNrDemand)));
+                combsFiltered.AddRange(_Combs.Where(t => t.ContainsAny(playerNrDemand)));
 
             //2nd fallback
             if (combsFiltered.Count == 0)
@@ -191,7 +191,7 @@ namespace VocaluxeLib.PartyModes.Challenge
 
             int num = (int)Math.Pow(2, _NumPlayer);
 
-            for (int i = 1; i <= num; i++)
+            for (int i = 1; i < num; i++)
             {
                 CCombination c = new CCombination();
 
@@ -216,19 +216,19 @@ namespace VocaluxeLib.PartyModes.Challenge
             Player = new List<int>();
         }
 
-        public bool IsAvailable(int playerIndex)
+        public bool Contains(int playerIndex)
         {
             return Player.Any(p => p == playerIndex);
         }
 
-        public bool IsAvailableAll(IEnumerable<int> playerIndices)
+        public bool ContainsAll(IEnumerable<int> playerIndices)
         {
-            return playerIndices.All(IsAvailable);
+            return playerIndices.All(Contains);
         }
 
-        public bool IsAvailableSomeone(IEnumerable<int> playerIndices)
+        public bool ContainsAny(IEnumerable<int> playerIndices)
         {
-            return playerIndices.Any(IsAvailable);
+            return playerIndices.Any(Contains);
         }
     }
 }

PartyModes/PartyModeChallenge/CPartyModeChallenge.cs

@@ -67,11 +67,38 @@ namespace VocaluxeLib.PartyModes.Challenge
     public sealed class CPartyModeChallenge : CPartyMode
         // ReSharper restore ClassNeverInstantiated.Global
     {
-        private const int _MaxPlayer = 12;
-        private const int _MinPlayer = 1;
-        private const int _MaxTeams = 0;
-        private const int _MinTeams = 0;
-        private const int _MaxNumRounds = 100;
+        public override int MinMics
+        {
+            get { return 1; }
+        }
+        public override int MaxMics
+        {
+            get { return CBase.Config.GetMaxNumMics(); }
+        }
+        public override int MinPlayers
+        {
+            get { return 1; }
+        }
+        public override int MaxPlayers
+        {
+            get { return 12; }
+        }
+        public override int MinTeams
+        {
+            get { return 1; }
+        }
+        public override int MaxTeams
+        {
+            get { return 1; }
+        }
+        public override int MinPlayersPerTeam
+        {
+            get { return MinPlayers; }
+        }
+        public override int MaxPlayersPerTeam
+        {
+            get { return MaxPlayers; }
+        }
 
         private enum EStage
         {
@@ -108,7 +135,7 @@ namespace VocaluxeLib.PartyModes.Challenge
         public SData GameData;
         private EStage _Stage;
 
-        public CPartyModeChallenge(int id, string folder) : base(id, folder)
+        public CPartyModeChallenge(int id) : base(id)
         {
             _ScreenSongOptions.Selection.RandomOnly = false;
             _ScreenSongOptions.Selection.PartyMode = true;
@@ -125,6 +152,8 @@ namespace VocaluxeLib.PartyModes.Challenge
 
         public override bool Init()
         {
+            if (!base.Init())
+                return false;
             _Stage = EStage.Config;
 
             _ScreenSongOptions.Sorting.IgnoreArticles = CBase.Config.GetIgnoreArticles();
@@ -283,31 +312,6 @@ namespace VocaluxeLib.PartyModes.Challenge
             _ScreenSongOptions.Sorting.SearchActive = visible;
         }
 
-        public override int GetMaxPlayer()
-        {
-            return _MaxPlayer;
-        }
-
-        public override int GetMinPlayer()
-        {
-            return _MinPlayer;
-        }
-
-        public override int GetMaxTeams()
-        {
-            return _MaxTeams;
-        }
-
-        public override int GetMinTeams()
-        {
-            return _MinTeams;
-        }
-
-        public override int GetMaxNumRounds()
-        {
-            return _MaxNumRounds;
-        }
-
         public override void JokerUsed(int teamNr)
         {
             if (_ScreenSongOptions.Selection.NumJokers == null)

PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs

@@ -15,6 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+using System;
 using System.Windows.Forms;
 
 namespace VocaluxeLib.PartyModes.Challenge
@@ -35,8 +36,7 @@ namespace VocaluxeLib.PartyModes.Challenge
         private const string _ButtonNext = "ButtonNext";
         private const string _ButtonBack = "ButtonBack";
 
-        private int _MaxNumMics = 2;
-        private int _MaxNumRounds = 100;
+        private const int _MaxNumRounds = 100;
         private int _RoundSteps = 1;
 
         public override void Init()
@@ -107,12 +107,6 @@ namespace VocaluxeLib.PartyModes.Challenge
         {
             base.OnShow();
 
-            _MaxNumMics = CBase.Config.GetMaxNumMics();
-            if (_MaxNumMics > 6)
-                _MaxNumMics = 6;
-
-            _MaxNumRounds = _PartyMode.GetMaxNumRounds();
-
             _RebuildSlides();
         }
 
@@ -125,7 +119,7 @@ namespace VocaluxeLib.PartyModes.Challenge
         {
             // build num player slide (min player ... max player);
             _SelectSlides[_SelectSlideNumPlayers].Clear();
-            for (int i = _PartyMode.GetMinPlayer(); i <= _PartyMode.GetMaxPlayer(); i++)
+            for (int i = _PartyMode.MinPlayers; i <= _PartyMode.MaxPlayers; i++)
                 _SelectSlides[_SelectSlideNumPlayers].AddValue(i.ToString());
             _SelectSlides[_SelectSlideNumPlayers].SelectedValue = _PartyMode.GameData.NumPlayer.ToString();
 
@@ -138,8 +132,8 @@ namespace VocaluxeLib.PartyModes.Challenge
         {
             int player = _PartyMode.GameData.NumPlayer;
             int mics = _PartyMode.GameData.NumPlayerAtOnce;
-            _PartyMode.GameData.NumPlayer = _SelectSlides[_SelectSlideNumPlayers].Selection + _PartyMode.GetMinPlayer();
-            _PartyMode.GameData.NumPlayerAtOnce = _SelectSlides[_SelectSlideNumMics].Selection + _PartyMode.GetMinPlayer();
+            _PartyMode.GameData.NumPlayer = _SelectSlides[_SelectSlideNumPlayers].Selection + _PartyMode.MinPlayers;
+            _PartyMode.GameData.NumPlayerAtOnce = _SelectSlides[_SelectSlideNumMics].Selection + _PartyMode.MinPlayers;
             _PartyMode.GameData.NumRounds = (_SelectSlides[_SelectSlideNumRounds].Selection + 1) * _RoundSteps;
 
             _UpdateMicsAtOnce();
@@ -158,9 +152,7 @@ namespace VocaluxeLib.PartyModes.Challenge
 
         private void _UpdateMicsAtOnce()
         {
-            int maxNum = _MaxNumMics;
-            if (_PartyMode.GameData.NumPlayer < _MaxNumMics)
-                maxNum = _PartyMode.GameData.NumPlayer;
+            int maxNum = Math.Min(_PartyMode.MaxMics, _PartyMode.GameData.NumPlayer);
 
             if (_PartyMode.GameData.NumPlayerAtOnce > maxNum)
                 _PartyMode.GameData.NumPlayerAtOnce = maxNum;
@@ -169,7 +161,7 @@ namespace VocaluxeLib.PartyModes.Challenge
             _SelectSlides[_SelectSlideNumMics].Clear();
             for (int i = 1; i <= maxNum; i++)
                 _SelectSlides[_SelectSlideNumMics].AddValue(i.ToString());
-            _SelectSlides[_SelectSlideNumMics].Selection = _PartyMode.GameData.NumPlayerAtOnce - _PartyMode.GetMinPlayer();
+            _SelectSlides[_SelectSlideNumMics].Selection = _PartyMode.GameData.NumPlayerAtOnce - _PartyMode.MinPlayers;
         }
 
         private void _UpdateSlideRounds()

PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs

@@ -119,7 +119,7 @@ namespace VocaluxeLib.PartyModes.Challenge
             _NextPlayerTexts = new List<CText>();
             _NextPlayerStatics = new List<CStatic>();
 
-            for (int i = 0; i < _PartyMode.GetMaxPlayer(); i++)
+            for (int i = 0; i < _PartyMode.MaxPlayers; i++)
             {
                 _NextPlayerTexts.Add(GetNewText(_Texts[_TextNextPlayer]));
                 _AddText(_NextPlayerTexts[_NextPlayerTexts.Count - 1]);
@@ -326,7 +326,7 @@ namespace VocaluxeLib.PartyModes.Challenge
 
                 x += _Statics[_StaticNextPlayer].Rect.W + 15;
             }
-            for (int i = _PartyMode.GameData.NumPlayerAtOnce; i < _PartyMode.GetMaxPlayer(); i++)
+            for (int i = _PartyMode.GameData.NumPlayerAtOnce; i < _PartyMode.MaxPlayers; i++)
             {
                 _NextPlayerStatics[i].Visible = false;
                 _NextPlayerTexts[i].Visible = false;