Fix: Handling of song-selection in challenge-mode
This commit is contained in:
1 parent
577c983127
commit
1b0c40a20b
5 files changed
+57
-87
No files matched your search
@@ -139,7 +139,6 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
|
|
||||||
public int CurrentRoundNr;
|
public int CurrentRoundNr;
|
||||||
|
|
||||||
public int[] CatSongIndices;
|
|
||||||
public List<int> Songs;
|
public List<int> Songs;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,7 +181,6 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
CategoryIndex = 0,
|
CategoryIndex = 0,
|
||||||
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
|
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
|
||||||
NumMedleySongs = 5,
|
NumMedleySongs = 5,
|
||||||
CatSongIndices = null,
|
|
||||||
Results = null,
|
Results = null,
|
||||||
Songs = new List<int>()
|
Songs = new List<int>()
|
||||||
};
|
};
|
||||||
@@ -196,6 +194,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
||||||
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
|
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
|
||||||
_ScreenSongOptions.Selection.SongIndex = -1;
|
_ScreenSongOptions.Selection.SongIndex = -1;
|
||||||
|
_ScreenSongOptions.Selection.CategoryIndex = -1;
|
||||||
|
|
||||||
if (CBase.Config.GetTabs() == EOffOn.TR_CONFIG_ON && _ScreenSongOptions.Sorting.SongSorting != ESongSorting.TR_CONFIG_NONE)
|
if (CBase.Config.GetTabs() == EOffOn.TR_CONFIG_ON && _ScreenSongOptions.Sorting.SongSorting != ESongSorting.TR_CONFIG_NONE)
|
||||||
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
|
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
|
||||||
@@ -214,11 +213,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
|
|
||||||
public override void UpdateGame()
|
public override void UpdateGame()
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
|
|
||||||
_ScreenSongOptions.Selection.RandomOnly = true;
|
|
||||||
else
|
|
||||||
_ScreenSongOptions.Selection.RandomOnly = false;*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private IMenu _GetNextScreen()
|
private IMenu _GetNextScreen()
|
||||||
@@ -321,85 +316,27 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
|
|
||||||
public override SScreenSongOptions GetScreenSongOptions()
|
public override SScreenSongOptions GetScreenSongOptions()
|
||||||
{
|
{
|
||||||
_ScreenSongOptions.Selection.RandomOnly = true;
|
|
||||||
_ScreenSongOptions.Sorting.IgnoreArticles = CBase.Config.GetIgnoreArticles();
|
|
||||||
|
|
||||||
|
|
||||||
switch (GameData.SongSource)
|
|
||||||
{
|
|
||||||
case ESongSource.TR_SONGSOURCE_ALLSONGS:
|
|
||||||
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
|
||||||
_ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
|
|
||||||
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
|
||||||
|
|
||||||
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ESongSource.TR_SONGSOURCE_CATEGORY:
|
|
||||||
_ScreenSongOptions.Sorting.SongSorting = GameData.Sorting;
|
|
||||||
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
|
|
||||||
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
|
||||||
|
|
||||||
if (GameData.CatSongIndices == null)
|
|
||||||
_CreateCatSongIndices();
|
|
||||||
|
|
||||||
_ScreenSongOptions.Selection.SongIndex = GameData.CatSongIndices[GameData.CategoryIndex];
|
|
||||||
|
|
||||||
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ESongSource.TR_SONGSOURCE_PLAYLIST:
|
|
||||||
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
|
||||||
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
|
|
||||||
_ScreenSongOptions.Sorting.FilterPlaylistID = GameData.PlaylistID;
|
|
||||||
|
|
||||||
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return _ScreenSongOptions;
|
return _ScreenSongOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReSharper disable RedundantAssignment
|
|
||||||
public override void OnSongChange(int songIndex, ref SScreenSongOptions screenSongOptions)
|
public override void OnSongChange(int songIndex, ref SScreenSongOptions screenSongOptions)
|
||||||
// ReSharper restore RedundantAssignment
|
|
||||||
{
|
{
|
||||||
_ScreenSongOptions.Selection.SongIndex = -1;
|
|
||||||
|
|
||||||
if (_ScreenSongOptions.Selection.SelectNextRandomSong && songIndex != -1)
|
if (_ScreenSongOptions.Selection.SelectNextRandomSong && songIndex != -1)
|
||||||
{
|
|
||||||
_ScreenSongOptions.Selection.SelectNextRandomSong = false;
|
_ScreenSongOptions.Selection.SelectNextRandomSong = false;
|
||||||
_CreateCatSongIndices();
|
|
||||||
|
|
||||||
if (GameData.CatSongIndices != null)
|
_ScreenSongOptions.Selection.SongIndex = songIndex;
|
||||||
{
|
|
||||||
if (GameData.CatSongIndices[CBase.Songs.GetCurrentCategoryIndex()] == -1)
|
|
||||||
GameData.CatSongIndices[CBase.Songs.GetCurrentCategoryIndex()] = songIndex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
screenSongOptions = _ScreenSongOptions;
|
screenSongOptions = _ScreenSongOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReSharper disable RedundantAssignment
|
|
||||||
public override void OnCategoryChange(int categoryIndex, ref SScreenSongOptions screenSongOptions)
|
public override void OnCategoryChange(int categoryIndex, ref SScreenSongOptions screenSongOptions)
|
||||||
// ReSharper restore RedundantAssignment
|
|
||||||
{
|
{
|
||||||
if (GameData.CatSongIndices != null && categoryIndex != -1)
|
if (categoryIndex != -1)
|
||||||
{
|
|
||||||
if (GameData.CatSongIndices[categoryIndex] == -1)
|
|
||||||
_ScreenSongOptions.Selection.SelectNextRandomSong = true;
|
|
||||||
else
|
|
||||||
_ScreenSongOptions.Selection.SongIndex = GameData.CatSongIndices[categoryIndex];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (GameData.CatSongIndices == null && categoryIndex != -1)
|
|
||||||
_ScreenSongOptions.Selection.SelectNextRandomSong = true;
|
_ScreenSongOptions.Selection.SelectNextRandomSong = true;
|
||||||
|
else
|
||||||
|
_ScreenSongOptions.Selection.SongIndex = -1;
|
||||||
|
|
||||||
if (categoryIndex == -1)
|
_ScreenSongOptions.Selection.CategoryIndex = categoryIndex;
|
||||||
_ScreenSongOptions.Selection.RandomOnly = false;
|
|
||||||
|
|
||||||
if (_ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF || categoryIndex != -1)
|
|
||||||
_ScreenSongOptions.Selection.RandomOnly = true;
|
|
||||||
|
|
||||||
screenSongOptions = _ScreenSongOptions;
|
screenSongOptions = _ScreenSongOptions;
|
||||||
}
|
}
|
||||||
@@ -470,11 +407,42 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void _PrepareSongSelection()
|
private void _PrepareSongSelection()
|
||||||
{
|
{
|
||||||
_ScreenSongOptions.Selection.RandomOnly = _ScreenSongOptions.Sorting.Tabs != EOffOn.TR_CONFIG_ON;
|
_ScreenSongOptions.Selection.RandomOnly = true;
|
||||||
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
|
_ScreenSongOptions.Selection.SelectNextRandomSong = true;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Sorting.IgnoreArticles = CBase.Config.GetIgnoreArticles();
|
||||||
|
|
||||||
|
switch (GameData.SongSource)
|
||||||
|
{
|
||||||
|
case ESongSource.TR_SONGSOURCE_ALLSONGS:
|
||||||
|
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
||||||
|
_ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
|
||||||
|
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Selection.CategoryIndex = -1;
|
||||||
|
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ESongSource.TR_SONGSOURCE_CATEGORY:
|
||||||
|
_ScreenSongOptions.Sorting.SongSorting = GameData.Sorting;
|
||||||
|
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_ON;
|
||||||
|
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Selection.CategoryIndex = GameData.CategoryIndex;
|
||||||
|
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ESongSource.TR_SONGSOURCE_PLAYLIST:
|
||||||
|
_ScreenSongOptions.Sorting.SongSorting = CBase.Config.GetSongSorting();
|
||||||
|
_ScreenSongOptions.Sorting.Tabs = EOffOn.TR_CONFIG_OFF;
|
||||||
|
_ScreenSongOptions.Sorting.FilterPlaylistID = GameData.PlaylistID;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Selection.CategoryChangeAllowed = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
_SetNumJokers();
|
_SetNumJokers();
|
||||||
_SetTeamNames();
|
_SetTeamNames();
|
||||||
GameData.CatSongIndices = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -741,18 +709,5 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _CreateCatSongIndices()
|
|
||||||
{
|
|
||||||
if (GameData.CatSongIndices == null && CBase.Songs.GetNumCategories() > 0 && _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_ON)
|
|
||||||
{
|
|
||||||
GameData.CatSongIndices = new int[CBase.Songs.GetNumCategories()];
|
|
||||||
for (int i = 1; i < GameData.CatSongIndices.Length; i++)
|
|
||||||
GameData.CatSongIndices[i] = CBase.Songs.GetNumSongsInCategory(i) + GameData.CatSongIndices[i - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (CBase.Songs.GetNumCategories() == 0 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
|
|
||||||
GameData.CatSongIndices = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -647,7 +647,15 @@ namespace Vocaluxe.Screens
|
|||||||
if (_Sso.Selection.CategoryIndex != CBase.Songs.GetCurrentCategoryIndex())
|
if (_Sso.Selection.CategoryIndex != CBase.Songs.GetCurrentCategoryIndex())
|
||||||
{
|
{
|
||||||
_SelectedCategoryIndex = _Sso.Selection.CategoryIndex;
|
_SelectedCategoryIndex = _Sso.Selection.CategoryIndex;
|
||||||
_SongMenu.EnterSelectedCategory();
|
if (_SelectedCategoryIndex != -1)
|
||||||
|
{
|
||||||
|
_SongMenu.SetSelectedCategory(_SelectedCategoryIndex);
|
||||||
|
_SongMenu.EnterSelectedCategory();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_SongMenu.LeaveSelectedCategory();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
_SearchActive = _Sso.Sorting.SearchActive;
|
_SearchActive = _Sso.Sorting.SearchActive;
|
||||||
_SearchText = _Sso.Sorting.SearchString;
|
_SearchText = _Sso.Sorting.SearchString;
|
||||||
|
|||||||
@@ -286,6 +286,11 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
_PreviewNr = _SelectionNr;
|
_PreviewNr = _SelectionNr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void LeaveSelectedCategory()
|
||||||
|
{
|
||||||
|
_LeaveCategory();
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void UnloadSkin() {}
|
public virtual void UnloadSkin() {}
|
||||||
|
|
||||||
public virtual void LoadSkin()
|
public virtual void LoadSkin()
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
int GetSelectedCategory();
|
int GetSelectedCategory();
|
||||||
void SetSelectedCategory(int categoryNr);
|
void SetSelectedCategory(int categoryNr);
|
||||||
bool EnterSelectedCategory();
|
bool EnterSelectedCategory();
|
||||||
|
void LeaveSelectedCategory();
|
||||||
|
|
||||||
// The song that is currently playing (set e.g. by clicking on a song)
|
// The song that is currently playing (set e.g. by clicking on a song)
|
||||||
int GetPreviewSong();
|
int GetPreviewSong();
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ namespace VocaluxeLib.PartyModes
|
|||||||
_ScreenSongOptions.Selection.NumJokers = null;
|
_ScreenSongOptions.Selection.NumJokers = null;
|
||||||
_ScreenSongOptions.Selection.TeamNames = null;
|
_ScreenSongOptions.Selection.TeamNames = null;
|
||||||
_ScreenSongOptions.Selection.SongIndex = -1;
|
_ScreenSongOptions.Selection.SongIndex = -1;
|
||||||
|
_ScreenSongOptions.Selection.CategoryIndex = -1;
|
||||||
|
|
||||||
_ScreenSongOptions.Sorting.SearchString = String.Empty;
|
_ScreenSongOptions.Sorting.SearchString = String.Empty;
|
||||||
_ScreenSongOptions.Sorting.SearchActive = false;
|
_ScreenSongOptions.Sorting.SearchActive = false;
|
||||||
|
|||||||
Reference in new issue
Block a user