Fix blank screen issue

Also fix some other bugs and improvements (easier party modes, volume fixes, new fields for screens to control volume and popups)
This commit is contained in:
Flamefire committed 2014-11-27 21:47:02 +01:00
1 parent 36b81e8c1f
commit 26484ad137
62 files changed
+1160 -1964

No files matched your search

@@ -53,81 +53,20 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public bool Finished;
}
#region Communication
#region ToScreen
public struct SDataToScreenConfig
public abstract class CPartyScreenTicTacToe : CMenuParty
{
public int NumFields;
public ESongSource SongSource;
public int CategoryID;
public int PlaylistID;
public EPartyGameMode GameMode;
protected new CPartyModeTicTacToe _PartyMode;
public override void Init()
{
base.Init();
_PartyMode = (CPartyModeTicTacToe)base._PartyMode;
}
}
public struct SDataToScreenNames
{
public int NumPlayerTeam1;
public int NumPlayerTeam2;
public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2;
}
public struct SDataToScreenMain
{
public int CurrentRoundNr;
public int Team;
public int NumFields;
public List<CRound> Rounds;
public List<int> Songs;
public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
public int[] NumJokerRandom;
public int[] NumJokerRetry;
}
public struct SDataFromScreen
{
public SFromScreenConfig ScreenConfig;
public SFromScreenNames ScreenNames;
public SFromScreenMain ScreenMain;
}
public struct SFromScreenConfig
{
public int NumFields;
public ESongSource SongSource;
public int CategoryID;
public int PlaylistID;
public EPartyGameMode GameMode;
}
public struct SFromScreenNames
{
public bool FadeToConfig;
public int NumPlayerTeam1;
public int NumPlayerTeam2;
public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2;
}
public struct SFromScreenMain
{
public bool FadeToSinging;
public bool FadeToNameSelection;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
public List<CRound> Rounds;
public int SingRoundNr;
public List<int> Songs;
}
#endregion FromScreen
#endregion Communication
// ReSharper disable ClassNeverInstantiated.Global
public sealed class CPartyModeTicTacToe : CPartyMode
// ReSharper restore ClassNeverInstantiated.Global
{
private const int _MaxPlayer = 20;
private const int _MinPlayer = 2;
@@ -139,14 +78,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private enum EStage
{
NotStarted,
Config,
Names,
Main,
Singing
}
private struct SData
public struct SData
{
public int NumPlayerTeam1;
public int NumPlayerTeam2;
@@ -173,11 +111,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public int[] NumJokerRetry;
}
private SDataToScreenConfig _ToScreenConfig;
private SDataToScreenNames _ToScreenNames;
private SDataToScreenMain _ToScreenMain;
private SData _GameData;
public SData GameData;
private EStage _Stage;
public CPartyModeTicTacToe(int id, string folder)
@@ -193,17 +127,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_ScreenSongOptions.Sorting.SearchActive = false;
_ScreenSongOptions.Sorting.DuetOptions = EDuetOptions.NoDuets;
_Stage = EStage.NotStarted;
_ToScreenConfig = new SDataToScreenConfig();
_ToScreenNames = new SDataToScreenNames();
_ToScreenMain = new SDataToScreenMain();
_GameData = new SData
GameData = new SData
{
NumFields = 9,
NumPlayerTeam1 = 2,
NumPlayerTeam2 = 2,
NumFields = 9,
ProfileIDsTeam1 = new List<int>(),
ProfileIDsTeam2 = new List<int>(),
PlayerTeam1 = new List<int>(),
@@ -223,7 +151,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override bool Init()
{
_Stage = EStage.NotStarted;
_Stage = EStage.Config;
_ScreenSongOptions.Sorting.IgnoreArticles = CBase.Config.GetIgnoreArticles();
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
@@ -233,100 +161,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (CBase.Config.GetTabs() == EOffOn.TR_CONFIG_ON && _ScreenSongOptions.Sorting.SongSorting != ESongSorting.TR_CONFIG_NONE)
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
_ToScreenMain.Rounds = new List<CRound>();
_ToScreenMain.Songs = new List<int>();
_ToScreenMain.PlayerTeam1 = new List<int>();
_ToScreenMain.PlayerTeam2 = new List<int>();
_GameData.Songs = new List<int>();
_GameData.Rounds = new List<CRound>();
_GameData.PlayerTeam1 = new List<int>();
_GameData.PlayerTeam2 = new List<int>();
GameData.Songs = new List<int>();
GameData.Rounds = new List<CRound>();
GameData.PlayerTeam1 = new List<int>();
GameData.PlayerTeam2 = new List<int>();
return true;
}
public override void DataFromScreen(string screenName, Object data)
{
var dataFrom = new SDataFromScreen();
switch (screenName)
{
case "PartyScreenTicTacToeConfig":
try
{
dataFrom = (SDataFromScreen)data;
_GameData.NumFields = dataFrom.ScreenConfig.NumFields;
_GameData.SongSource = dataFrom.ScreenConfig.SongSource;
_GameData.CategoryID = dataFrom.ScreenConfig.CategoryID;
_GameData.PlaylistID = dataFrom.ScreenConfig.PlaylistID;
_GameData.GameMode = dataFrom.ScreenConfig.GameMode;
_Stage = EStage.Config;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
}
catch (Exception e)
{
CBase.Log.LogError("Error in party mode TicTacToe. Can't cast received data from screen " + screenName + ". " + e.Message);
}
break;
case "PartyScreenTicTacToeNames":
try
{
dataFrom = (SDataFromScreen)data;
if (dataFrom.ScreenNames.FadeToConfig)
_Stage = EStage.NotStarted;
else
{
_GameData.Team = CBase.Game.GetRandom(100) < 50 ? 0 : 1;
_GameData.NumPlayerTeam1 = dataFrom.ScreenNames.NumPlayerTeam1;
_GameData.NumPlayerTeam2 = dataFrom.ScreenNames.NumPlayerTeam2;
_GameData.ProfileIDsTeam1 = dataFrom.ScreenNames.ProfileIDsTeam1;
_GameData.ProfileIDsTeam2 = dataFrom.ScreenNames.ProfileIDsTeam2;
_Stage = EStage.Names;
}
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
}
catch (Exception e)
{
CBase.Log.LogError("Error in party mode TicTacToe. Can't cast received data from screen " + screenName + ". " + e.Message);
}
break;
case "PartyScreenTicTacToeMain":
try
{
dataFrom = (SDataFromScreen)data;
if (dataFrom.ScreenMain.FadeToSinging)
{
_Stage = EStage.Singing;
_GameData.Rounds = dataFrom.ScreenMain.Rounds;
_GameData.SingRoundNr = dataFrom.ScreenMain.SingRoundNr;
_GameData.Songs = dataFrom.ScreenMain.Songs;
_GameData.PlayerTeam1 = dataFrom.ScreenMain.PlayerTeam1;
_GameData.PlayerTeam2 = dataFrom.ScreenMain.PlayerTeam2;
}
if (dataFrom.ScreenMain.FadeToNameSelection)
_Stage = EStage.Config;
}
catch (Exception e)
{
CBase.Log.LogError("Error in party mode TicTacToe. Can't cast received data from screen " + screenName + ". " + e.Message);
}
if (_Stage == EStage.Singing)
_StartRound(dataFrom.ScreenMain.SingRoundNr);
if (_Stage == EStage.Config)
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
break;
default:
CBase.Log.LogError("Error in party mode TicTacToe. Wrong screen is sending: " + screenName);
break;
}
}
public override void UpdateGame()
{
/*
@@ -336,98 +177,83 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_ScreenSongOptions.Selection.RandomOnly = false;*/
}
public override CMenuParty GetNextPartyScreen(out EScreens alternativeScreen)
private IMenu _GetNextScreen()
{
CMenuParty screen = null;
alternativeScreen = EScreens.ScreenSong;
switch (_Stage)
{
case EStage.NotStarted:
_Screens.TryGetValue("CPartyScreenTicTacToeConfig", out screen);
if (screen != null)
{
_ToScreenConfig.NumFields = _GameData.NumFields;
_ToScreenConfig.SongSource = _GameData.SongSource;
_ToScreenConfig.CategoryID = _GameData.CategoryID;
_ToScreenConfig.PlaylistID = _GameData.PlaylistID;
_ToScreenConfig.GameMode = _GameData.GameMode;
screen.DataToScreen(_ToScreenConfig);
}
break;
case EStage.Config:
_Screens.TryGetValue("CPartyScreenTicTacToeNames", out screen);
if (screen != null)
{
_ToScreenNames.NumPlayerTeam1 = _GameData.NumPlayerTeam1;
_ToScreenNames.NumPlayerTeam2 = _GameData.NumPlayerTeam2;
_ToScreenNames.ProfileIDsTeam1 = _GameData.ProfileIDsTeam1;
_ToScreenNames.ProfileIDsTeam2 = _GameData.ProfileIDsTeam2;
screen.DataToScreen(_ToScreenNames);
}
return _Screens["CPartyScreenTicTacToeConfig"];
case EStage.Names:
return _Screens["CPartyScreenTicTacToeNames"];
case EStage.Main:
return _Screens["CPartyScreenTicTacToeMain"];
case EStage.Singing:
return CBase.Graphics.GetScreen(EScreen.Song);
default:
throw new ArgumentException("Invalid stage: " + _Stage);
}
}
private void _FadeToScreen()
{
CBase.Graphics.FadeTo(_GetNextScreen());
}
public void Next()
{
switch (_Stage)
{
case EStage.Config:
_Stage = EStage.Names;
break;
case EStage.Names:
_Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen);
if (screen != null)
{
_GameData.Team = _GameData.Team == 1 ? 0 : 1;
CBase.Songs.ResetSongSung();
_GameData.CurrentRoundNr = 1;
_ToScreenMain.CurrentRoundNr = 1;
_ToScreenMain.NumFields = _GameData.NumFields;
_ToScreenMain.ProfileIDsTeam1 = _GameData.ProfileIDsTeam1;
_ToScreenMain.ProfileIDsTeam2 = _GameData.ProfileIDsTeam2;
_CreateRounds();
_SetNumJokers();
_PreparePlayerList(0);
_PrepareSongList();
_ToScreenMain.Rounds = _GameData.Rounds;
_ToScreenMain.Songs = _GameData.Songs;
_ToScreenMain.PlayerTeam1 = _GameData.PlayerTeam1;
_ToScreenMain.PlayerTeam1 = _GameData.PlayerTeam2;
_ToScreenMain.NumJokerRandom = _GameData.NumJokerRandom;
_ToScreenMain.NumJokerRetry = _GameData.NumJokerRetry;
_ToScreenMain.Team = _GameData.Team;
screen.DataToScreen(_ToScreenMain);
}
_Stage = EStage.Main;
GameData.Team = CBase.Game.GetRandom(100) < 50 ? 0 : 1;
CBase.Songs.ResetSongSung();
GameData.CurrentRoundNr = 1;
_CreateRounds();
_SetNumJokers();
_PreparePlayerList(0);
_PrepareSongList();
break;
case EStage.Main:
//nothing to do
_Stage = EStage.Singing;
_StartRound(GameData.SingRoundNr);
break;
case EStage.Singing:
_Screens.TryGetValue("CPartyScreenTicTacToeMain", out screen);
if (screen != null)
{
_GameData.Team = _GameData.Team == 1 ? 0 : 1;
_UpdateSongList();
_UpdatePlayerList();
_ToScreenMain.CurrentRoundNr = _GameData.CurrentRoundNr;
_ToScreenMain.NumFields = _GameData.NumFields;
_ToScreenMain.ProfileIDsTeam1 = _GameData.ProfileIDsTeam1;
_ToScreenMain.ProfileIDsTeam2 = _GameData.ProfileIDsTeam2;
_ToScreenMain.Rounds = _GameData.Rounds;
_ToScreenMain.Songs = _GameData.Songs;
_ToScreenMain.PlayerTeam1 = _GameData.PlayerTeam1;
_ToScreenMain.PlayerTeam2 = _GameData.PlayerTeam2;
_ToScreenMain.NumJokerRandom = _GameData.NumJokerRandom;
_ToScreenMain.NumJokerRetry = _GameData.NumJokerRetry;
_ToScreenMain.Team = _GameData.Team;
screen.DataToScreen(_ToScreenMain);
}
_Stage = EStage.Main;
GameData.Team = GameData.Team == 1 ? 0 : 1;
_UpdateSongList();
_UpdatePlayerList();
break;
default:
throw new ArgumentException("Invalid stage: " + _Stage);
}
return screen;
_FadeToScreen();
}
public override EScreens GetStartScreen()
public void Back()
{
return EScreens.ScreenPartyDummy;
switch (_Stage)
{
case EStage.Config:
CBase.Graphics.FadeTo(EScreen.Party);
return;
case EStage.Names:
_Stage = EStage.Config;
break;
case EStage.Main:
_Stage = EStage.Config;
break;
default: // Rest is not allowed
throw new ArgumentException("Invalid stage: " + _Stage);
}
_FadeToScreen();
}
public override EScreens GetMainScreen()
public override IMenu GetStartScreen()
{
return EScreens.ScreenPartyDummy;
return _Screens["CPartyScreenTicTacToeConfig"];
}
public override SScreenSongOptions GetScreenSongOptions()
@@ -500,7 +326,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{
var gm = EGameMode.TR_GAMEMODE_NORMAL;
switch (_GameData.GameMode)
switch (GameData.GameMode)
{
case EPartyGameMode.TR_GAMEMODE_NORMAL:
gm = EGameMode.TR_GAMEMODE_NORMAL;
@@ -516,23 +342,23 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
CBase.Game.AddSong(songID, gm);
CBase.Graphics.FadeTo(EScreens.ScreenSing);
CBase.Graphics.FadeTo(EScreen.Sing);
}
public override void LeavingHighscore()
{
CBase.Songs.AddPartySongSung(CBase.Game.GetSong(0).ID);
_UpdateScores();
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
Next();
}
private void _CreateRounds()
{
_GameData.Rounds = new List<CRound>();
for (int i = 0; i < _GameData.NumFields; i++)
GameData.Rounds = new List<CRound>();
for (int i = 0; i < GameData.NumFields; i++)
{
var r = new CRound();
_GameData.Rounds.Add(r);
GameData.Rounds.Add(r);
}
}
@@ -542,41 +368,41 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{
case 0:
{
_GameData.PlayerTeam1 = new List<int>();
_GameData.PlayerTeam2 = new List<int>();
GameData.PlayerTeam1 = new List<int>();
GameData.PlayerTeam2 = new List<int>();
//Prepare Player-IDs
var ids1 = new List<int>();
var ids2 = new List<int>();
//Add IDs to team-list
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] &&
_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
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++)
for (int i = 0; i < GameData.NumPlayerTeam1; i++)
ids1.Add(i);
}
if (ids2.Count == 0)
{
for (int i = 0; i < _GameData.NumPlayerTeam2; i++)
for (int i = 0; i < GameData.NumPlayerTeam2; i++)
ids2.Add(i);
}
int num;
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
{
num = CBase.Game.GetRandom(ids1.Count);
if (num >= ids1.Count)
num = ids1.Count - 1;
_GameData.PlayerTeam1.Add(ids1[num]);
GameData.PlayerTeam1.Add(ids1[num]);
ids1.RemoveAt(num);
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
num = CBase.Game.GetRandom(ids2.Count);
if (num >= ids2.Count)
num = ids2.Count - 1;
_GameData.PlayerTeam2.Add(ids2[num]);
GameData.PlayerTeam2.Add(ids2[num]);
ids2.RemoveAt(num);
}
}
@@ -587,19 +413,19 @@ namespace VocaluxeLib.PartyModes.TicTacToe
//Prepare Player-IDs
var ids = new List<int>();
//Add IDs to team-list
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] && ids.Count == 0)
while (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0] && ids.Count == 0)
{
if (ids.Count == 0)
{
for (int i = 0; i < _GameData.NumPlayerTeam1; i++)
for (int i = 0; i < GameData.NumPlayerTeam1; i++)
ids.Add(i);
}
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
if (GameData.PlayerTeam1.Count < GameData.NumFields + GameData.NumJokerRetry[0])
{
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam1.Add(ids[num]);
GameData.PlayerTeam1.Add(ids[num]);
ids.RemoveAt(num);
}
}
@@ -610,19 +436,19 @@ namespace VocaluxeLib.PartyModes.TicTacToe
//Prepare Player-IDs
var ids = new List<int>();
//Add IDs to team-list
while (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1] && ids.Count == 0)
while (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1] && ids.Count == 0)
{
if (ids.Count == 0)
{
for (int i = 0; i < _GameData.NumPlayerTeam2; i++)
for (int i = 0; i < GameData.NumPlayerTeam2; i++)
ids.Add(i);
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
if (GameData.PlayerTeam2.Count < GameData.NumFields + GameData.NumJokerRetry[1])
{
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam2.Add(ids[num]);
GameData.PlayerTeam2.Add(ids[num]);
ids.RemoveAt(num);
}
}
@@ -635,7 +461,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{
var gm = EGameMode.TR_GAMEMODE_NORMAL;
switch (_GameData.GameMode)
switch (GameData.GameMode)
{
case EPartyGameMode.TR_GAMEMODE_NORMAL:
gm = EGameMode.TR_GAMEMODE_NORMAL;
@@ -650,15 +476,15 @@ namespace VocaluxeLib.PartyModes.TicTacToe
break;
}
while (_GameData.Songs.Count < (_GameData.NumFields + _GameData.NumJokerRandom[0] + _GameData.NumJokerRandom[1]))
while (GameData.Songs.Count < (GameData.NumFields + GameData.NumJokerRandom[0] + GameData.NumJokerRandom[1]))
{
var songs = new List<int>();
switch (_GameData.SongSource)
switch (GameData.SongSource)
{
case ESongSource.TR_PLAYLIST:
for (int i = 0; i < CBase.Playlist.GetSongCount(_GameData.PlaylistID); i++)
for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++)
{
int id = CBase.Playlist.GetSong(_GameData.PlaylistID, i).SongID;
int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID;
// ReSharper disable LoopCanBeConvertedToQuery
foreach (EGameMode mode in CBase.Songs.GetSongByID(id).AvailableGameModes)
// ReSharper restore LoopCanBeConvertedToQuery
@@ -683,7 +509,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
break;
case ESongSource.TR_CATEGORY:
CBase.Songs.SetCategory(_GameData.CategoryID);
CBase.Songs.SetCategory(GameData.CategoryID);
for (int i = 0; i < CBase.Songs.GetNumSongsVisible(); i++)
{
// ReSharper disable LoopCanBeConvertedToQuery
@@ -699,23 +525,23 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
while (songs.Count > 0)
{
_GameData.Songs.Add(songs[CBase.Game.GetRandom(songs.Count - 1)]);
songs.Remove(_GameData.Songs[_GameData.Songs.Count - 1]);
GameData.Songs.Add(songs[CBase.Game.GetRandom(songs.Count - 1)]);
songs.Remove(GameData.Songs[GameData.Songs.Count - 1]);
}
}
}
private void _UpdatePlayerList()
{
if (_GameData.PlayerTeam1.Count == 0)
if (GameData.PlayerTeam1.Count == 0)
_PreparePlayerList(1);
if (_GameData.PlayerTeam2.Count == 0)
if (GameData.PlayerTeam2.Count == 0)
_PreparePlayerList(2);
}
private void _UpdateSongList()
{
if (_GameData.Songs.Count == 0)
if (GameData.Songs.Count == 0)
_PrepareSongList();
}
@@ -733,7 +559,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (players.Length < 2)
return;
CRound r = _GameData.Rounds[roundNr];
CRound r = GameData.Rounds[roundNr];
bool isDuet = CBase.Songs.GetSongByID(r.SongID).IsDuet;
for (int i = 0; i < 2; i++)
@@ -745,11 +571,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
//try to fill with the right data
if (r != null)
{
players[0].ProfileID = _GameData.ProfileIDsTeam1[r.SingerTeam1];
players[0].ProfileID = GameData.ProfileIDsTeam1[r.SingerTeam1];
if (isDuet)
players[0].VoiceNr = 0;
players[1].ProfileID = _GameData.ProfileIDsTeam2[r.SingerTeam2];
players[1].ProfileID = GameData.ProfileIDsTeam2[r.SingerTeam2];
if (isDuet)
players[1].VoiceNr = 1;
@@ -759,35 +585,35 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _SetNumJokers()
{
switch (_GameData.NumFields)
switch (GameData.NumFields)
{
case 9:
_GameData.NumJokerRandom[0] = 1;
_GameData.NumJokerRandom[1] = 1;
_GameData.NumJokerRetry[0] = 0;
_GameData.NumJokerRetry[1] = 0;
GameData.NumJokerRandom[0] = 1;
GameData.NumJokerRandom[1] = 1;
GameData.NumJokerRetry[0] = 0;
GameData.NumJokerRetry[1] = 0;
break;
case 16:
_GameData.NumJokerRandom[0] = 2;
_GameData.NumJokerRandom[1] = 2;
_GameData.NumJokerRetry[0] = 1;
_GameData.NumJokerRetry[1] = 1;
GameData.NumJokerRandom[0] = 2;
GameData.NumJokerRandom[1] = 2;
GameData.NumJokerRetry[0] = 1;
GameData.NumJokerRetry[1] = 1;
break;
case 25:
_GameData.NumJokerRandom[0] = 3;
_GameData.NumJokerRandom[1] = 3;
_GameData.NumJokerRetry[0] = 2;
_GameData.NumJokerRetry[1] = 2;
GameData.NumJokerRandom[0] = 3;
GameData.NumJokerRandom[1] = 3;
GameData.NumJokerRetry[0] = 2;
GameData.NumJokerRetry[1] = 2;
break;
}
}
private void _UpdateScores()
{
if (!_GameData.Rounds[_GameData.SingRoundNr].Finished)
_GameData.CurrentRoundNr++;
if (!GameData.Rounds[GameData.SingRoundNr].Finished)
GameData.CurrentRoundNr++;
SPlayer[] results = CBase.Game.GetPlayers();
if (results == null)
@@ -796,17 +622,17 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (results.Length < 2)
return;
_GameData.Rounds[_GameData.SingRoundNr].PointsTeam1 = (int)Math.Round(results[0].Points);
_GameData.Rounds[_GameData.SingRoundNr].PointsTeam2 = (int)Math.Round(results[1].Points);
_GameData.Rounds[_GameData.SingRoundNr].Finished = true;
if (_GameData.Rounds[_GameData.SingRoundNr].PointsTeam1 < _GameData.Rounds[_GameData.SingRoundNr].PointsTeam2)
_GameData.Rounds[_GameData.SingRoundNr].Winner = 2;
else if (_GameData.Rounds[_GameData.SingRoundNr].PointsTeam1 > _GameData.Rounds[_GameData.SingRoundNr].PointsTeam2)
_GameData.Rounds[_GameData.SingRoundNr].Winner = 1;
GameData.Rounds[GameData.SingRoundNr].PointsTeam1 = (int)Math.Round(results[0].Points);
GameData.Rounds[GameData.SingRoundNr].PointsTeam2 = (int)Math.Round(results[1].Points);
GameData.Rounds[GameData.SingRoundNr].Finished = true;
if (GameData.Rounds[GameData.SingRoundNr].PointsTeam1 < GameData.Rounds[GameData.SingRoundNr].PointsTeam2)
GameData.Rounds[GameData.SingRoundNr].Winner = 2;
else if (GameData.Rounds[GameData.SingRoundNr].PointsTeam1 > GameData.Rounds[GameData.SingRoundNr].PointsTeam2)
GameData.Rounds[GameData.SingRoundNr].Winner = 1;
else
{
_GameData.Rounds[_GameData.SingRoundNr].Finished = false;
_GameData.CurrentRoundNr--;
GameData.Rounds[GameData.SingRoundNr].Finished = false;
GameData.CurrentRoundNr--;
}
}
}