Merge branch 'develop' into player-guid
This commit is contained in:
commit
86dc259c17
387 files changed
+18124
-16761
No files matched your search
@@ -27,18 +27,9 @@ using VocaluxeLib.Songs;
|
||||
|
||||
namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
{
|
||||
public enum ESongSource
|
||||
{
|
||||
// ReSharper disable InconsistentNaming
|
||||
TR_ALLSONGS,
|
||||
TR_CATEGORY,
|
||||
TR_PLAYLIST
|
||||
// ReSharper restore InconsistentNaming
|
||||
}
|
||||
|
||||
public class CRound
|
||||
{
|
||||
public int SongID;
|
||||
public int[] SongIDs;
|
||||
public int SingerTeam1;
|
||||
public int SingerTeam2;
|
||||
public int PointsTeam1;
|
||||
@@ -60,7 +51,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
// ReSharper disable ClassNeverInstantiated.Global
|
||||
public sealed class CPartyModeTicTacToe : CPartyMode
|
||||
// ReSharper restore ClassNeverInstantiated.Global
|
||||
// ReSharper restore ClassNeverInstantiated.Global
|
||||
{
|
||||
public override int MinMics
|
||||
{
|
||||
@@ -96,9 +87,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
get { return 10; }
|
||||
}
|
||||
|
||||
private enum EStage
|
||||
public readonly EGameMode[] AvailableGameModes = { EGameMode.TR_GAMEMODE_NORMAL, EGameMode.TR_GAMEMODE_SHORTSONG, EGameMode.TR_GAMEMODE_DUET };
|
||||
|
||||
private enum EStage
|
||||
{
|
||||
Config,
|
||||
Songs,
|
||||
Names,
|
||||
Main,
|
||||
Singing
|
||||
@@ -116,10 +110,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
public List<int> PlayerTeam2;
|
||||
|
||||
public ESongSource SongSource;
|
||||
public ESongSorting Sorting;
|
||||
public int CategoryIndex;
|
||||
public int PlaylistID;
|
||||
|
||||
public EGameMode GameMode;
|
||||
public int NumMedleySongs;
|
||||
|
||||
public List<CRound> Rounds;
|
||||
public List<int> Songs;
|
||||
@@ -129,6 +125,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
public int[] NumJokerRandom;
|
||||
public int[] NumJokerRetry;
|
||||
public EOffOn RefillJokers;
|
||||
}
|
||||
|
||||
public SData GameData;
|
||||
@@ -157,14 +154,17 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
PlayerTeam2 = new List<int>(),
|
||||
CurrentRoundNr = 0,
|
||||
FieldNr = 0,
|
||||
SongSource = ESongSource.TR_ALLSONGS,
|
||||
Sorting = CBase.Config.GetSongSorting(),
|
||||
SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS,
|
||||
PlaylistID = 0,
|
||||
CategoryIndex = 0,
|
||||
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
|
||||
NumMedleySongs = 5,
|
||||
Rounds = new List<CRound>(),
|
||||
Songs = new List<int>(),
|
||||
NumJokerRandom = new int[2],
|
||||
NumJokerRetry = new int[2]
|
||||
NumJokerRetry = new int[2],
|
||||
RefillJokers = EOffOn.TR_CONFIG_OFF
|
||||
};
|
||||
}
|
||||
|
||||
@@ -210,6 +210,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
{
|
||||
case EStage.Config:
|
||||
return _Screens["CPartyScreenTicTacToeConfig"];
|
||||
case EStage.Songs:
|
||||
return _Screens["CPartyScreenTicTacToeSongs"];
|
||||
case EStage.Names:
|
||||
return _Screens["CPartyScreenTicTacToeNames"];
|
||||
case EStage.Main:
|
||||
@@ -232,6 +234,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
switch (_Stage)
|
||||
{
|
||||
case EStage.Config:
|
||||
_Stage = EStage.Songs;
|
||||
break;
|
||||
case EStage.Songs:
|
||||
_Stage = EStage.Names;
|
||||
break;
|
||||
case EStage.Names:
|
||||
@@ -251,6 +256,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
_Stage = EStage.Main;
|
||||
GameData.Team = GameData.Team == 1 ? 0 : 1;
|
||||
_UpdatePlayerList();
|
||||
if (GameData.RefillJokers == EOffOn.TR_CONFIG_ON)
|
||||
_SetNumJokers();
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentException("Invalid stage: " + _Stage);
|
||||
@@ -265,9 +272,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
case EStage.Config:
|
||||
CBase.Graphics.FadeTo(EScreen.Party);
|
||||
return;
|
||||
case EStage.Names:
|
||||
case EStage.Songs:
|
||||
_Stage = EStage.Config;
|
||||
break;
|
||||
case EStage.Names:
|
||||
_Stage = EStage.Songs;
|
||||
break;
|
||||
case EStage.Main:
|
||||
_Stage = EStage.Names;
|
||||
break;
|
||||
@@ -428,7 +438,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
switch (GameData.SongSource)
|
||||
{
|
||||
case ESongSource.TR_PLAYLIST:
|
||||
case ESongSource.TR_SONGSOURCE_PLAYLIST:
|
||||
for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++)
|
||||
{
|
||||
int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID;
|
||||
@@ -437,12 +447,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
}
|
||||
break;
|
||||
|
||||
case ESongSource.TR_ALLSONGS:
|
||||
case ESongSource.TR_SONGSOURCE_ALLSONGS:
|
||||
ReadOnlyCollection<CSong> avSongs = CBase.Songs.GetSongs();
|
||||
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID));
|
||||
break;
|
||||
|
||||
case ESongSource.TR_CATEGORY:
|
||||
case ESongSource.TR_SONGSOURCE_CATEGORY:
|
||||
CBase.Songs.SortSongs(GameData.Sorting, EOffOn.TR_CONFIG_ON, CBase.Config.GetIgnoreArticles(), "", EDuetOptions.All, -1);
|
||||
CBase.Songs.SetCategory(GameData.CategoryIndex);
|
||||
avSongs = CBase.Songs.GetVisibleSongs();
|
||||
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID));
|
||||
@@ -476,7 +487,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
return;
|
||||
|
||||
CRound round = GameData.Rounds[roundNr];
|
||||
bool isDuet = CBase.Songs.GetSongByID(round.SongID).IsDuet;
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
@@ -486,14 +496,10 @@ namespace VocaluxeLib.PartyModes.TicTacToe
|
||||
|
||||
//try to fill with the right data
|
||||
players[0].ProfileID = GameData.ProfileIDsTeam1[round.SingerTeam1];
|
||||
if (isDuet)
|
||||
players[0].VoiceNr = 0;
|
||||
|
||||
players[1].ProfileID = GameData.ProfileIDsTeam2[round.SingerTeam2];
|
||||
if (isDuet)
|
||||
players[1].VoiceNr = 1;
|
||||
|
||||
CBase.Game.AddSong(round.SongID, GameData.GameMode);
|
||||
foreach(int song in round.SongIDs)
|
||||
CBase.Game.AddSong(song, GameData.GameMode);
|
||||
}
|
||||
|
||||
private void _SetNumJokers()
|
||||
|
||||
Reference in new issue
Block a user