Simplify SelectSlides and fix a couple of problems there
This commit is contained in:
1 parent
cea1d43e6b
commit
1ba0d429a1
26 files changed
+317
-350
No files matched your search
@@ -83,12 +83,12 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
|
||||
int max = numPlayed.Max();
|
||||
|
||||
int num = Rounds[0].Player.Count;
|
||||
int playersPerRound = Rounds[0].Player.Count;
|
||||
List<int> result = new List<int>();
|
||||
List<int> other = new List<int>();
|
||||
List<int> last = new List<int>();
|
||||
|
||||
for (int i = 0; i < numPlayed.Count; i++)
|
||||
for (int i = 0; i < _NumPlayer; i++)
|
||||
{
|
||||
if (roundIndex == 0 || numPlayed[i] < max)
|
||||
{
|
||||
@@ -111,7 +111,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
}
|
||||
}
|
||||
|
||||
while (result.Count < num && other.Count > 0)
|
||||
while (result.Count < playersPerRound && other.Count > 0)
|
||||
{
|
||||
int n = other.Count;
|
||||
int r = _Rand.Next(n);
|
||||
@@ -119,7 +119,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
other.RemoveAt(r);
|
||||
}
|
||||
|
||||
while (result.Count < num)
|
||||
while (result.Count < playersPerRound)
|
||||
{
|
||||
int n = last.Count;
|
||||
int r = _Rand.Next(n);
|
||||
@@ -127,7 +127,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
last.RemoveAt(r);
|
||||
}
|
||||
|
||||
while (result.Count > num)
|
||||
while (result.Count > playersPerRound)
|
||||
{
|
||||
int n = result.Count;
|
||||
int r = _Rand.Next(n);
|
||||
|
||||
@@ -127,7 +127,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
||||
_SelectSlides[_SelectSlideNumPlayers].Clear();
|
||||
for (int i = _PartyMode.GetMinPlayer(); i <= _PartyMode.GetMaxPlayer(); i++)
|
||||
_SelectSlides[_SelectSlideNumPlayers].AddValue(i.ToString());
|
||||
_SelectSlides[_SelectSlideNumPlayers].Selection = _PartyMode.GameData.NumPlayer - _PartyMode.GetMinPlayer();
|
||||
_SelectSlides[_SelectSlideNumPlayers].SelectedValue = _PartyMode.GameData.NumPlayer.ToString();
|
||||
|
||||
_UpdateMicsAtOnce();
|
||||
_SetRoundSteps();
|
||||
|
||||
Reference in new issue
Block a user