Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed player-selection in tic-tac-toe.

Browse Source
This commit is contained in:
Florian Küpper committed 2013-01-02 16:39:10 +01:00
1 parent f8995c8df8
commit d5f225ea67
2 files changed
+144 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
+125 -39
View File
@@ -62,6 +62,8 @@ namespace Vocaluxe.PartyModes
public List<int> Songs; public List<int> Songs;
public List<int> ProfileIDsTeam1; public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2; public List<int> ProfileIDsTeam2;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
public int[] NumJokerRandom; public int[] NumJokerRandom;
public int[] NumJokerRetry; public int[] NumJokerRetry;
} }
@@ -96,6 +98,8 @@ namespace Vocaluxe.PartyModes
{ {
public bool FadeToSinging; public bool FadeToSinging;
public bool FadeToNameSelection; public bool FadeToNameSelection;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
public List<Round> Rounds; public List<Round> Rounds;
public int SingRoundNr; public int SingRoundNr;
public List<int> Songs; public List<int> Songs;
@@ -128,6 +132,8 @@ namespace Vocaluxe.PartyModes
public int Team; public int Team;
public List<int> ProfileIDsTeam1; public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2; public List<int> ProfileIDsTeam2;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
public ESongSource SongSource; public ESongSource SongSource;
public int CategoryID; public int CategoryID;
@@ -176,6 +182,8 @@ namespace Vocaluxe.PartyModes
GameData.NumPlayerTeam2 = 2; GameData.NumPlayerTeam2 = 2;
GameData.ProfileIDsTeam1 = new List<int>(); GameData.ProfileIDsTeam1 = new List<int>();
GameData.ProfileIDsTeam2 = new List<int>(); GameData.ProfileIDsTeam2 = new List<int>();
GameData.PlayerTeam1 = new List<int>();
GameData.PlayerTeam2 = new List<int>();
GameData.CurrentRoundNr = 0; GameData.CurrentRoundNr = 0;
GameData.SingRoundNr = 0; GameData.SingRoundNr = 0;
GameData.SongSource = ESongSource.TR_ALLSONGS; GameData.SongSource = ESongSource.TR_ALLSONGS;
@@ -202,8 +210,12 @@ namespace Vocaluxe.PartyModes
ToScreenMain.Rounds = new List<Round>(); ToScreenMain.Rounds = new List<Round>();
ToScreenMain.Songs = new List<int>(); ToScreenMain.Songs = new List<int>();
ToScreenMain.PlayerTeam1 = new List<int>();
ToScreenMain.PlayerTeam2 = new List<int>();
GameData.Songs = new List<int>(); GameData.Songs = new List<int>();
GameData.Rounds = new List<Round>(); GameData.Rounds = new List<Round>();
GameData.PlayerTeam1 = new List<int>();
GameData.PlayerTeam2 = new List<int>();
return true; return true;
} }
@@ -269,6 +281,8 @@ namespace Vocaluxe.PartyModes
GameData.Rounds = data.ScreenMain.Rounds; GameData.Rounds = data.ScreenMain.Rounds;
GameData.SingRoundNr = data.ScreenMain.SingRoundNr; GameData.SingRoundNr = data.ScreenMain.SingRoundNr;
GameData.Songs = data.ScreenMain.Songs; GameData.Songs = data.ScreenMain.Songs;
GameData.PlayerTeam1 = data.ScreenMain.PlayerTeam1;
GameData.PlayerTeam2 = data.ScreenMain.PlayerTeam2;
} }
if (data.ScreenMain.FadeToNameSelection) if (data.ScreenMain.FadeToNameSelection)
{ {
@@ -351,10 +365,13 @@ namespace Vocaluxe.PartyModes
ToScreenMain.ProfileIDsTeam1 = GameData.ProfileIDsTeam1; ToScreenMain.ProfileIDsTeam1 = GameData.ProfileIDsTeam1;
ToScreenMain.ProfileIDsTeam2 = GameData.ProfileIDsTeam2; ToScreenMain.ProfileIDsTeam2 = GameData.ProfileIDsTeam2;
CreateRounds(); CreateRounds();
PrepareSongList();
SetNumJokers(); SetNumJokers();
PreparePlayerList(0);
PrepareSongList();
ToScreenMain.Rounds = GameData.Rounds; ToScreenMain.Rounds = GameData.Rounds;
ToScreenMain.Songs = GameData.Songs; ToScreenMain.Songs = GameData.Songs;
ToScreenMain.PlayerTeam1 = GameData.PlayerTeam1;
ToScreenMain.PlayerTeam1 = GameData.PlayerTeam2;
ToScreenMain.NumJokerRandom = GameData.NumJokerRandom; ToScreenMain.NumJokerRandom = GameData.NumJokerRandom;
ToScreenMain.NumJokerRetry = GameData.NumJokerRetry; ToScreenMain.NumJokerRetry = GameData.NumJokerRetry;
ToScreenMain.Team = GameData.Team; ToScreenMain.Team = GameData.Team;
@@ -372,6 +389,8 @@ namespace Vocaluxe.PartyModes
GameData.Team = 0; GameData.Team = 0;
else else
GameData.Team = 1; GameData.Team = 1;
UpdateSongList();
UpdatePlayerList();
ToScreenMain.CurrentRoundNr = GameData.CurrentRoundNr; ToScreenMain.CurrentRoundNr = GameData.CurrentRoundNr;
ToScreenMain.NumPlayerTeam1 = GameData.NumPlayerTeam1; ToScreenMain.NumPlayerTeam1 = GameData.NumPlayerTeam1;
ToScreenMain.NumPlayerTeam2 = GameData.NumPlayerTeam2; ToScreenMain.NumPlayerTeam2 = GameData.NumPlayerTeam2;
@@ -380,6 +399,8 @@ namespace Vocaluxe.PartyModes
ToScreenMain.ProfileIDsTeam2 = GameData.ProfileIDsTeam2; ToScreenMain.ProfileIDsTeam2 = GameData.ProfileIDsTeam2;
ToScreenMain.Rounds = GameData.Rounds; ToScreenMain.Rounds = GameData.Rounds;
ToScreenMain.Songs = GameData.Songs; ToScreenMain.Songs = GameData.Songs;
ToScreenMain.PlayerTeam1 = GameData.PlayerTeam1;
ToScreenMain.PlayerTeam2 = GameData.PlayerTeam2;
ToScreenMain.NumJokerRandom = GameData.NumJokerRandom; ToScreenMain.NumJokerRandom = GameData.NumJokerRandom;
ToScreenMain.NumJokerRetry = GameData.NumJokerRetry; ToScreenMain.NumJokerRetry = GameData.NumJokerRetry;
ToScreenMain.Team = GameData.Team; ToScreenMain.Team = GameData.Team;
@@ -490,51 +511,102 @@ namespace Vocaluxe.PartyModes
private void CreateRounds() private void CreateRounds()
{ {
GameData.Rounds = new List<Round>(); GameData.Rounds = new List<Round>();
//Prepare Player-IDs
List<int> Team1 = new List<int>();
List<int> Team2 = new List<int>();
List<int> IDs1 = new List<int>();
List<int> IDs2 = new List<int>();
int num = 0;
int random = 0;
//Add IDs to team-list
while (Team1.Count < GameData.NumFields)
{
if (IDs1.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam1; i++)
IDs1.Add(i);
if (IDs2.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam2; i++)
IDs2.Add(i);
if (Team1.Count < GameData.NumFields)
{
random = _Base.Game.GetRandom((IDs1.Count - 1) * 10);
num = (int)Math.Round((double)random/10);
if (num >= IDs1.Count)
num = IDs1.Count - 1;
Team1.Add(IDs1[num]);
IDs1.Remove(Team1[Team1.Count - 1]);
}
if (Team2.Count < GameData.NumFields)
{
random = _Base.Game.GetRandom((IDs2.Count - 1) * 20);
num = (int)Math.Round((double)random / 20);
if (num >= IDs2.Count)
num = IDs2.Count - 1;
Team2.Add(IDs2[num]);
IDs2.Remove(Team2[Team2.Count - 1]);
}
}
for (int i = 0; i < GameData.NumFields; i++) for (int i = 0; i < GameData.NumFields; i++)
{ {
Round r = new Round(); Round r = new Round();
r.SingerTeam1 = Team1[i];
r.SingerTeam2 = Team2[i];
GameData.Rounds.Add(r); GameData.Rounds.Add(r);
} }
} }
private void PreparePlayerList(int Team)
{
if (Team == 0)
{
GameData.PlayerTeam1 = new List<int>();
GameData.PlayerTeam2 = new List<int>();
//Prepare Player-IDs
List<int> IDs1 = new List<int>();
List<int> IDs2 = new List<int>();
int num = 0;
int random = 0;
//Add IDs to team-list
while (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0] && GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
if (IDs1.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam1; i++)
IDs1.Add(i);
if (IDs2.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam2; i++)
IDs2.Add(i);
if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
{
random = _Base.Game.GetRandom((IDs1.Count - 1) * 10);
num = (int)Math.Round((double)random / 10);
if (num >= IDs1.Count)
num = IDs1.Count - 1;
GameData.PlayerTeam1.Add(IDs1[num]);
IDs1.RemoveAt(num);
}
if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
random = _Base.Game.GetRandom((IDs2.Count - 1) * 20);
num = (int)Math.Round((double)random / 20);
if (num >= IDs2.Count)
num = IDs2.Count - 1;
GameData.PlayerTeam2.Add(IDs2[num]);
IDs2.RemoveAt(num);
}
}
}
else if (Team == 1)
{
//Prepare Player-IDs
List<int> IDs = new List<int>();
int num = 0;
int random = 0;
//Add IDs to team-list
while (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
{
if (IDs.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam1; i++)
IDs.Add(i);
if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
{
random = _Base.Game.GetRandom((IDs.Count - 1) * 10);
num = (int)Math.Round((double)random / 10);
if (num >= IDs.Count)
num = IDs.Count - 1;
GameData.PlayerTeam1.Add(IDs[num]);
IDs.RemoveAt(num);
}
}
}
else if (Team == 2)
{
//Prepare Player-IDs
List<int> IDs = new List<int>();
int num = 0;
int random = 0;
//Add IDs to team-list
while (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
if (IDs.Count == 0)
for (int i = 0; i < GameData.NumPlayerTeam2; i++)
IDs.Add(i);
if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
random = _Base.Game.GetRandom((IDs.Count - 1) * 20);
num = (int)Math.Round((double)random / 20);
if (num >= IDs.Count)
num = IDs.Count - 1;
GameData.PlayerTeam2.Add(IDs[num]);
IDs.RemoveAt(num);
}
}
}
}
private void PrepareSongList() private void PrepareSongList()
{ {
EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL; EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
@@ -596,6 +668,20 @@ namespace Vocaluxe.PartyModes
} }
} }
private void UpdatePlayerList()
{
if (GameData.PlayerTeam1.Count < GameData.NumFields - (GameData.CurrentRoundNr - 1) + GameData.NumJokerRetry[0])
PreparePlayerList(1);
if (GameData.PlayerTeam2.Count < GameData.NumFields - (GameData.CurrentRoundNr - 1) + GameData.NumJokerRetry[0])
PreparePlayerList(2);
}
private void UpdateSongList()
{
if (GameData.Songs.Count < GameData.NumFields - (GameData.CurrentRoundNr - 1) + GameData.NumJokerRandom[0] + GameData.NumJokerRandom[1])
PrepareSongList();
}
private void StartRound(int RoundNr) private void StartRound(int RoundNr)
{ {
_Base.Game.Reset(); _Base.Game.Reset();
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
+19
View File
@@ -89,6 +89,8 @@ namespace Vocaluxe.PartyModes
config.SingRoundNr = 1; config.SingRoundNr = 1;
config.Rounds = new List<Round>(); config.Rounds = new List<Round>();
config.Songs = new List<int>(); config.Songs = new List<int>();
config.PlayerTeam1 = new List<int>();
config.PlayerTeam2 = new List<int>();
config.FadeToNameSelection = false; config.FadeToNameSelection = false;
config.FadeToSinging = false; config.FadeToSinging = false;
Data.ScreenMain = config; Data.ScreenMain = config;
@@ -463,11 +465,24 @@ namespace Vocaluxe.PartyModes
private void FieldSelected() private void FieldSelected()
{ {
int SongID = 0; int SongID = 0;
int SingerTeam1 = 0;
int SingerTeam2 = 0;
if (GameData.Songs.Count > 0) if (GameData.Songs.Count > 0)
{ {
SongID = GameData.Songs[0]; SongID = GameData.Songs[0];
GameData.Songs.RemoveAt(0); GameData.Songs.RemoveAt(0);
} }
if (GameData.PlayerTeam1.Count > 0)
{
SingerTeam1 = GameData.PlayerTeam1[0];
GameData.PlayerTeam1.RemoveAt(0);
}
if (GameData.PlayerTeam2.Count > 0)
{
SingerTeam2 = GameData.PlayerTeam2[0];
GameData.PlayerTeam2.RemoveAt(0);
}
Menu.SongMenu.CSong Song = _Base.Songs.GetSongByID(SongID); Menu.SongMenu.CSong Song = _Base.Songs.GetSongByID(SongID);
_Base.BackgroundMusic.SetStatus(true); _Base.BackgroundMusic.SetStatus(true);
@@ -480,6 +495,8 @@ namespace Vocaluxe.PartyModes
Status = EStatus.FieldSelected; Status = EStatus.FieldSelected;
Fields[SelectedField].Content.SongID = SongID; Fields[SelectedField].Content.SongID = SongID;
GameData.Rounds[SelectedField].SongID = SongID; GameData.Rounds[SelectedField].SongID = SongID;
GameData.Rounds[SelectedField].SingerTeam1 = SingerTeam1;
GameData.Rounds[SelectedField].SingerTeam2 = SingerTeam2;
UpdateFieldContents(); UpdateFieldContents();
Texts[htTexts(TextNextPlayerT1)].Visible = true; Texts[htTexts(TextNextPlayerT1)].Visible = true;
@@ -605,6 +622,8 @@ namespace Vocaluxe.PartyModes
Data.ScreenMain.FadeToSinging = true; Data.ScreenMain.FadeToSinging = true;
Data.ScreenMain.Songs = GameData.Songs; Data.ScreenMain.Songs = GameData.Songs;
Data.ScreenMain.SingRoundNr = SelectedField; Data.ScreenMain.SingRoundNr = SelectedField;
Data.ScreenMain.PlayerTeam1 = GameData.PlayerTeam1;
Data.ScreenMain.PlayerTeam2 = GameData.PlayerTeam2;
_PartyMode.DataFromScreen(_ThemeName, Data); _PartyMode.DataFromScreen(_ThemeName, Data);
} }