Added some more config-options: Song-Source (All songs, category (Show tabs must be "on" in game-options!), playlist) and Game-Mode (normal, duet, short-song)

Output/PartyModes/TicTacToe/Languages/Deutsch.xml

@@ -17,6 +17,9 @@
 		<TR_BUTTON_NEXT_ROUND>Starten</TR_BUTTON_NEXT_ROUND>
 		<TR_SONGS>Songs</TR_SONGS>
 		<TR_TEAM>Team</TR_TEAM>
+		<TR_PLAYLIST>Playlist</TR_PLAYLIST>
+		<TR_CATEGORY>Kategorie</TR_CATEGORY>
+		<TR_ALLSONGS>Alle Songs</TR_ALLSONGS>
 		<!--ScreenConfig-->
 		<TR_SCREENCONFIG_TITLE>Tic-Tac-Toe: Einstellungen</TR_SCREENCONFIG_TITLE>
 		<TR_SCREENCONFIG_NUMPLAYERT1>Anzahl der Spieler in Team 1</TR_SCREENCONFIG_NUMPLAYERT1>

Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml

@@ -169,11 +169,40 @@
       <!--<Font>: Text font name-->
       <Font>Outline</Font>
       <!--<Text>: Nothing or translation tag-->
-      <Text>TR_SCREENCONFIG_PLAYLIST</Text>
+      <Text>TR_SCREENCONFIG_SONGSOURCE</Text>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
     </Text5>    
+    <Text6>
+      <!--<X>, <Y>: Text position-->
+      <X>75</X>
+      <Y>405</Y>
+      <!--<Z>: Text position-->
+      <Z>0,00</Z>
+      <!--<H>: Text height-->
+      <H>32</H>
+      <!--<MaxW>: Maximum text width (if exists)-->
+      <!--<Color>: Text color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>StaticColor</Color>
+      <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>TextSColor</SColor>
+      <!--<Align>: Text align horizontal: Left, Center, Right-->
+      <Align>Left</Align>
+      <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+      <HAlign>Center</HAlign>
+      <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+      <Style>Bold</Style>
+      <!--<Font>: Text font name-->
+      <Font>Outline</Font>
+      <!--<Text>: Nothing or translation tag-->
+      <Text>TR_SCREENCONFIG_GAMEMODE</Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+    </Text6>    
 	<ButtonNext>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
@@ -483,7 +512,7 @@
       <!--<NumVisible>: Number of visible elements in the slide-->
       <NumVisible>3</NumVisible>
     </SelectSlideNumFields>    
-    <SelectSlidePlaylist>
+    <SelectSlideSongSource>
       <!--<Skin>: Texture name-->
       <Skin>Invisible</Skin>
       <!--<SkinArrowLeft>: Texture name of left arrow-->
@@ -546,7 +575,202 @@
       <!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
       <TextStyle>Bold</TextStyle>
       <!--<NumVisible>: Number of visible elements in the slide-->
+      <NumVisible>3</NumVisible>
+    </SelectSlideSongSource>    
+    <SelectSlidePlaylist>
+      <!--<Skin>: Texture name-->
+      <Skin>Invisible</Skin>
+      <!--<SkinArrowLeft>: Texture name of left arrow-->
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <!--<SkinArrowRight>: Texture name of right arrow-->
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <!--<SkinSelected>: Texture name for selected SelectSlide-->
+      <SkinSelected>SelectSlide</SkinSelected>
+      <!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
+      <SkinHighlighted>SelectSlide</SkinHighlighted>
+      <!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
+      <X>500</X>
+      <Y>340</Y>
+      <Z>0,00</Z>
+      <W>700</W>
+      <H>50</H>
+      <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
+      <ArrowLeftX>505</ArrowLeftX>
+      <ArrowLeftY>345</ArrowLeftY>
+      <ArrowLeftZ>0,00</ArrowLeftZ>
+      <ArrowLeftW>40</ArrowLeftW>
+      <ArrowLeftH>40</ArrowLeftH>
+      <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
+      <ArrowRightX>1170</ArrowRightX>
+      <ArrowRightY>345</ArrowRightY>
+      <ArrowRightZ>0,00</ArrowRightZ>
+      <ArrowRightW>40</ArrowRightW>
+      <ArrowRightH>40</ArrowRightH>
+      <!--<Color>: SelectSlide color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>SelectSlideColor</Color>
+      <!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>SelectSlideSColor</SColor>
+      <!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
+      <!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
+      <HColor>SelectSlideHColor</HColor>
+      <!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
+      <ArrowColor>ArrowColor</ArrowColor>
+      <!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
+      <ArrowSColor>ArrowSColor</ArrowSColor>
+      <!--<TextColor>: Text color from ColorScheme (high priority)-->
+      <!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
+      <TextColor>TextColor</TextColor>
+      <!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
+      <!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
+      <TextSColor>TextSColor</TextSColor>
+      <!--<TextH>: Text height-->
+      <TextH>32,00</TextH>
+      <!--<TextMaxW>: Maximum text width (if exists)-->
+      <TextMaxW>205,33</TextMaxW>
+      <!--<TextFont>: Text font name-->
+      <TextFont>Outline</TextFont>
+      <!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
+      <TextStyle>Bold</TextStyle>
+      <!--<NumVisible>: Number of visible elements in the slide-->
       <NumVisible>1</NumVisible>
     </SelectSlidePlaylist>    
+    <SelectSlideCategory>
+      <!--<Skin>: Texture name-->
+      <Skin>Invisible</Skin>
+      <!--<SkinArrowLeft>: Texture name of left arrow-->
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <!--<SkinArrowRight>: Texture name of right arrow-->
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <!--<SkinSelected>: Texture name for selected SelectSlide-->
+      <SkinSelected>SelectSlide</SkinSelected>
+      <!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
+      <SkinHighlighted>SelectSlide</SkinHighlighted>
+      <!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
+      <X>500</X>
+      <Y>340</Y>
+      <Z>0,00</Z>
+      <W>700</W>
+      <H>50</H>
+      <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
+      <ArrowLeftX>505</ArrowLeftX>
+      <ArrowLeftY>345</ArrowLeftY>
+      <ArrowLeftZ>0,00</ArrowLeftZ>
+      <ArrowLeftW>40</ArrowLeftW>
+      <ArrowLeftH>40</ArrowLeftH>
+      <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
+      <ArrowRightX>1170</ArrowRightX>
+      <ArrowRightY>345</ArrowRightY>
+      <ArrowRightZ>0,00</ArrowRightZ>
+      <ArrowRightW>40</ArrowRightW>
+      <ArrowRightH>40</ArrowRightH>
+      <!--<Color>: SelectSlide color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>SelectSlideColor</Color>
+      <!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>SelectSlideSColor</SColor>
+      <!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
+      <!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
+      <HColor>SelectSlideHColor</HColor>
+      <!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
+      <ArrowColor>ArrowColor</ArrowColor>
+      <!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
+      <ArrowSColor>ArrowSColor</ArrowSColor>
+      <!--<TextColor>: Text color from ColorScheme (high priority)-->
+      <!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
+      <TextColor>TextColor</TextColor>
+      <!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
+      <!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
+      <TextSColor>TextSColor</TextSColor>
+      <!--<TextH>: Text height-->
+      <TextH>32,00</TextH>
+      <!--<TextMaxW>: Maximum text width (if exists)-->
+      <TextMaxW>205,33</TextMaxW>
+      <!--<TextFont>: Text font name-->
+      <TextFont>Outline</TextFont>
+      <!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
+      <TextStyle>Bold</TextStyle>
+      <!--<NumVisible>: Number of visible elements in the slide-->
+      <NumVisible>1</NumVisible>
+    </SelectSlideCategory>    
+    <SelectSlideGameMode>
+      <!--<Skin>: Texture name-->
+      <Skin>Invisible</Skin>
+      <!--<SkinArrowLeft>: Texture name of left arrow-->
+      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
+      <!--<SkinArrowRight>: Texture name of right arrow-->
+      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
+      <!--<SkinSelected>: Texture name for selected SelectSlide-->
+      <SkinSelected>SelectSlide</SkinSelected>
+      <!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
+      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
+      <!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
+      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
+      <!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
+      <SkinHighlighted>SelectSlide</SkinHighlighted>
+      <!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
+      <X>500</X>
+      <Y>400</Y>
+      <Z>0,00</Z>
+      <W>700</W>
+      <H>50</H>
+      <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
+      <ArrowLeftX>505</ArrowLeftX>
+      <ArrowLeftY>405</ArrowLeftY>
+      <ArrowLeftZ>0,00</ArrowLeftZ>
+      <ArrowLeftW>40</ArrowLeftW>
+      <ArrowLeftH>40</ArrowLeftH>
+      <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
+      <ArrowRightX>1170</ArrowRightX>
+      <ArrowRightY>405</ArrowRightY>
+      <ArrowRightZ>0,00</ArrowRightZ>
+      <ArrowRightW>40</ArrowRightW>
+      <ArrowRightH>40</ArrowRightH>
+      <!--<Color>: SelectSlide color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>SelectSlideColor</Color>
+      <!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>SelectSlideSColor</SColor>
+      <!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
+      <!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
+      <HColor>SelectSlideHColor</HColor>
+      <!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
+      <ArrowColor>ArrowColor</ArrowColor>
+      <!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
+      <!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
+      <ArrowSColor>ArrowSColor</ArrowSColor>
+      <!--<TextColor>: Text color from ColorScheme (high priority)-->
+      <!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
+      <TextColor>TextColor</TextColor>
+      <!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
+      <!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
+      <TextSColor>TextSColor</TextSColor>
+      <!--<TextH>: Text height-->
+      <TextH>32,00</TextH>
+      <!--<TextMaxW>: Maximum text width (if exists)-->
+      <TextMaxW>205,33</TextMaxW>
+      <!--<TextFont>: Text font name-->
+      <TextFont>Outline</TextFont>
+      <!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
+      <TextStyle>Bold</TextStyle>
+      <!--<NumVisible>: Number of visible elements in the slide-->
+      <NumVisible>1</NumVisible>
+    </SelectSlideGameMode>    
   </PartyScreenTicTacToeConfig>
 </root>

PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs

@@ -6,6 +6,20 @@ using Vocaluxe.Menu;
 
 namespace Vocaluxe.PartyModes
 {
+    public enum ESongSource
+    {
+        TR_ALLSONGS,
+        TR_CATEGORY,
+        TR_PLAYLIST
+    }
+
+    public enum EPartyGameMode
+    {
+        TR_GAMEMODE_NORMAL,
+        TR_GAMEMODE_SHORTSONG,
+        TR_GAMEMODE_DUET
+    }
+
     public class Round
     {
         public int SongID;
@@ -23,7 +37,10 @@ namespace Vocaluxe.PartyModes
         public int NumPlayerTeam1;
         public int NumPlayerTeam2;
         public int NumFields;
+        public ESongSource SongSource;
+        public int CategoryID;
         public int PlaylistID;
+        public EPartyGameMode GameMode;
     }
 
     public struct DataToScreenNames
@@ -61,7 +78,10 @@ namespace Vocaluxe.PartyModes
         public int NumPlayerTeam1;
         public int NumPlayerTeam2;
         public int NumFields;
+        public ESongSource SongSource;
+        public int CategoryID;
         public int PlaylistID;
+        public EPartyGameMode GameMode;
     }
 
     public struct FromScreenNames
@@ -109,8 +129,12 @@ namespace Vocaluxe.PartyModes
             public List<int> ProfileIDsTeam1;
             public List<int> ProfileIDsTeam2;
 
+            public ESongSource SongSource;
+            public int CategoryID;
             public int PlaylistID;
 
+            public EPartyGameMode GameMode;
+
             public List<Round> Rounds;
             public List<int> Songs;
 
@@ -154,7 +178,10 @@ namespace Vocaluxe.PartyModes
             GameData.ProfileIDsTeam2 = new List<int>();
             GameData.CurrentRoundNr = 0;
             GameData.SingRoundNr = 0;
+            GameData.SongSource = ESongSource.TR_ALLSONGS;
             GameData.PlaylistID = 0;
+            GameData.CategoryID = 0;
+            GameData.GameMode = EPartyGameMode.TR_GAMEMODE_NORMAL;
             GameData.Rounds = new List<Round>();
             GameData.Songs = new List<int>();
             GameData.NumJokerRandom = new int[2];
@@ -193,7 +220,10 @@ namespace Vocaluxe.PartyModes
                         GameData.NumPlayerTeam1 = data.ScreenConfig.NumPlayerTeam1;
                         GameData.NumPlayerTeam2 = data.ScreenConfig.NumPlayerTeam2;
                         GameData.NumFields = data.ScreenConfig.NumFields;
+                        GameData.SongSource = data.ScreenConfig.SongSource;
+                        GameData.CategoryID = data.ScreenConfig.CategoryID;
                         GameData.PlaylistID = data.ScreenConfig.PlaylistID;
+                        GameData.GameMode = data.ScreenConfig.GameMode;
 
                         _Stage = EStage.Config;
                         _Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
@@ -286,7 +316,10 @@ namespace Vocaluxe.PartyModes
                         ToScreenConfig.NumPlayerTeam1 = GameData.NumPlayerTeam1;
                         ToScreenConfig.NumPlayerTeam2 = GameData.NumPlayerTeam2;
                         ToScreenConfig.NumFields = GameData.NumFields;
+                        ToScreenConfig.SongSource = GameData.SongSource;
+                        ToScreenConfig.CategoryID = GameData.CategoryID;
                         ToScreenConfig.PlaylistID = GameData.PlaylistID;
+                        ToScreenConfig.GameMode = GameData.GameMode;
                         Screen.DataToScreen(ToScreenConfig);
                     }
                     break;
@@ -426,10 +459,22 @@ namespace Vocaluxe.PartyModes
 
         public override void SongSelected(int SongID)
         {
-
             EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
 
+            switch (GameData.GameMode)
+            {
+                case EPartyGameMode.TR_GAMEMODE_NORMAL:
+                    gm = EGameMode.TR_GAMEMODE_NORMAL;
+                    break;
 
+                case EPartyGameMode.TR_GAMEMODE_DUET:
+                    gm = EGameMode.TR_GAMEMODE_DUET;
+                    break;
+
+                case EPartyGameMode.TR_GAMEMODE_SHORTSONG:
+                    gm = EGameMode.TR_GAMEMODE_SHORTSONG;
+                    break;
+            }
             _Base.Game.AddSong(SongID, gm);
 
             _Base.Songs.AddPartySongSung(SongID);
@@ -482,11 +527,56 @@ namespace Vocaluxe.PartyModes
 
         private void PrepareSongList()
         {
+            EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
+
+            switch (GameData.GameMode)
+            {
+                case EPartyGameMode.TR_GAMEMODE_NORMAL:
+                    gm = EGameMode.TR_GAMEMODE_NORMAL;
+                    break;
+
+                case EPartyGameMode.TR_GAMEMODE_DUET:
+                    gm = EGameMode.TR_GAMEMODE_DUET;
+                    break;
+
+                case EPartyGameMode.TR_GAMEMODE_SHORTSONG:
+                    gm = EGameMode.TR_GAMEMODE_SHORTSONG;
+                    break;
+            }
+
             while(GameData.Songs.Count < (GameData.NumFields + GameData.NumJokerRandom[0] + GameData.NumJokerRandom[1])){
                 List<int> Songs = new List<int>();
-                for (int i = 0; i < _Base.Playlist.GetPlaylistSongCount(GameData.PlaylistID); i++)
+                switch (GameData.SongSource)
                 {
-                    Songs.Add(_Base.Playlist.GetPlaylistSong(GameData.PlaylistID, i).SongID);
+                    case ESongSource.TR_PLAYLIST:
+                        for (int i = 0; i < _Base.Playlist.GetPlaylistSongCount(GameData.PlaylistID); i++)
+                        {
+                            int id = _Base.Playlist.GetPlaylistSong(GameData.PlaylistID, i).SongID;
+                            foreach (EGameMode mode in _Base.Songs.GetSongByID(id).AvailableGameModes)
+                                if (mode == gm) 
+                                    Songs.Add(id);
+                        }
+                        break;
+
+                    case ESongSource.TR_ALLSONGS:
+                        for (int i = 0; i < _Base.Songs.GetNumSongs(); i++)
+                        {
+                            foreach (EGameMode mode in _Base.Songs.GetSongByID(i).AvailableGameModes)
+                                if (mode == gm) 
+                                    Songs.Add(i);
+                        }
+                        break;
+
+                    case ESongSource.TR_CATEGORY:
+                        _Base.Songs.SetCategory(GameData.CategoryID);
+                        for (int i = 0; i < _Base.Songs.NumSongsInCategory(GameData.CategoryID); i++)
+                        {
+                            foreach(EGameMode mode in _Base.Songs.GetVisibleSong(i).AvailableGameModes)
+                                if(mode == gm) 
+                                    Songs.Add(_Base.Songs.GetVisibleSong(i).ID);
+                        }
+                        _Base.Songs.SetCategory(-1);
+                        break;
                 }
                 while(Songs.Count > 0)
                 {
@@ -529,12 +619,16 @@ namespace Vocaluxe.PartyModes
                     player[0].Name = profiles[GameData.ProfileIDsTeam1[r.SingerTeam1]].PlayerName;
                     player[0].Difficulty = profiles[GameData.ProfileIDsTeam1[r.SingerTeam1]].Difficulty;
                     player[0].ProfileID = GameData.ProfileIDsTeam1[r.SingerTeam1];
+                    if (GameData.GameMode == EPartyGameMode.TR_GAMEMODE_DUET)
+                        player[0].LineNr = 0;
                 }
                 if (GameData.ProfileIDsTeam2[r.SingerTeam2] < profiles.Length)
                 {
                     player[1].Name = profiles[GameData.ProfileIDsTeam2[r.SingerTeam2]].PlayerName;
                     player[1].Difficulty = profiles[GameData.ProfileIDsTeam2[r.SingerTeam2]].Difficulty;
                     player[1].ProfileID = GameData.ProfileIDsTeam2[r.SingerTeam2];
+                    if (GameData.GameMode == EPartyGameMode.TR_GAMEMODE_DUET)
+                        player[1].LineNr = 1;
                 }
                 SongSelected(r.SongID);
             }

PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs

@@ -15,7 +15,10 @@ namespace Vocaluxe.PartyModes
         const string SelectSlideNumPlayerTeam1 = "SelectSlideNumPlayerTeam1";
         const string SelectSlideNumPlayerTeam2 = "SelectSlideNumPlayerTeam2";
         const string SelectSlideNumFields = "SelectSlideNumFields";
+        const string SelectSlideSongSource = "SelectSlideSongSource";
         const string SelectSlidePlaylist = "SelectSlidePlaylist";
+        const string SelectSlideCategory = "SelectSlideCategory";
+        const string SelectSlideGameMode = "SelectSlideGameMode";
         const string ButtonNext = "ButtonNext";
         const string ButtonBack = "ButtonBack";
 
@@ -32,7 +35,7 @@ namespace Vocaluxe.PartyModes
             base.Init();
 
             _ThemeName = "PartyScreenTicTacToeConfig";
-            _ThemeSelectSlides = new string[] { SelectSlideNumPlayerTeam1, SelectSlideNumPlayerTeam2, SelectSlideNumFields, SelectSlidePlaylist };
+            _ThemeSelectSlides = new string[] { SelectSlideNumPlayerTeam1, SelectSlideNumPlayerTeam2, SelectSlideNumFields, SelectSlideSongSource, SelectSlidePlaylist, SelectSlideCategory, SelectSlideGameMode };
             _ThemeButtons = new string[] { ButtonNext, ButtonBack };
             _ScreenVersion = ScreenVersion;
 
@@ -42,6 +45,9 @@ namespace Vocaluxe.PartyModes
             config.NumFields = 9;
             config.NumPlayerTeam1 = 2;
             config.NumPlayerTeam2 = 2;
+            config.GameMode = EPartyGameMode.TR_GAMEMODE_NORMAL;
+            config.CategoryID = 0;
+            config.SongSource = ESongSource.TR_ALLSONGS;
             Data.ScreenConfig = config;
         }
 
@@ -61,6 +67,9 @@ namespace Vocaluxe.PartyModes
                 Data.ScreenConfig.NumPlayerTeam1 = config.NumPlayerTeam1;
                 Data.ScreenConfig.NumPlayerTeam2 = config.NumPlayerTeam2;
                 Data.ScreenConfig.PlaylistID = config.PlaylistID;
+                Data.ScreenConfig.CategoryID = config.CategoryID;
+                Data.ScreenConfig.SongSource = config.SongSource;
+                Data.ScreenConfig.GameMode = config.GameMode;
             }
             catch (Exception e)
             {
@@ -186,6 +195,9 @@ namespace Vocaluxe.PartyModes
             else if (Data.ScreenConfig.NumFields == 25)
                 SelectSlides[htSelectSlides(SelectSlideNumFields)].Selection = 2;
 
+            SelectSlides[htSelectSlides(SelectSlideSongSource)].Clear();
+            SelectSlides[htSelectSlides(SelectSlideSongSource)].SetValues<ESongSource>((int)Data.ScreenConfig.SongSource);
+
             string[] _Playlists = _Base.Playlist.GetPlaylistNames();
             SelectSlides[htSelectSlides(SelectSlidePlaylist)].Clear();
             for (int i = 0; i < _Playlists.Length; i++)
@@ -194,7 +206,24 @@ namespace Vocaluxe.PartyModes
                 SelectSlides[htSelectSlides(SelectSlidePlaylist)].AddValue(value);
             }
             SelectSlides[htSelectSlides(SelectSlidePlaylist)].Selection = Data.ScreenConfig.PlaylistID;
+            SelectSlides[htSelectSlides(SelectSlidePlaylist)].Visible = Data.ScreenConfig.SongSource == ESongSource.TR_PLAYLIST;
 
+            string[] _Categories = new string[_Base.Songs.GetNumCategories()];
+            for (int i = 0; i < _Base.Songs.GetNumCategories(); i++ )
+            {
+                _Categories[i] = _Base.Songs.GetCategory(i).Name;
+            }
+            SelectSlides[htSelectSlides(SelectSlideCategory)].Clear();
+            for (int i = 0; i < _Categories.Length; i++)
+            {
+                string value = _Categories[i] + " (" + _Base.Songs.NumSongsInCategory(i) + " " + _Base.Language.Translate("TR_SONGS", _PartyModeID) + ")";
+                SelectSlides[htSelectSlides(SelectSlideCategory)].AddValue(value);
+            }
+            SelectSlides[htSelectSlides(SelectSlideCategory)].Selection = Data.ScreenConfig.CategoryID;
+            SelectSlides[htSelectSlides(SelectSlideCategory)].Visible = Data.ScreenConfig.SongSource == ESongSource.TR_CATEGORY;
+
+            SelectSlides[htSelectSlides(SelectSlideGameMode)].Visible = true;
+            SelectSlides[htSelectSlides(SelectSlideGameMode)].SetValues<EPartyGameMode>((int)Data.ScreenConfig.GameMode);
         }
 
         private void UpdateSlides()
@@ -209,12 +238,98 @@ namespace Vocaluxe.PartyModes
             else if (SelectSlides[htSelectSlides(SelectSlideNumFields)].Selection == 2)
                 Data.ScreenConfig.NumFields = 25;
 
+            Data.ScreenConfig.SongSource = (ESongSource)SelectSlides[htSelectSlides(SelectSlideSongSource)].Selection;
             Data.ScreenConfig.PlaylistID = SelectSlides[htSelectSlides(SelectSlidePlaylist)].Selection;
+            Data.ScreenConfig.CategoryID = SelectSlides[htSelectSlides(SelectSlideCategory)].Selection;
+            Data.ScreenConfig.GameMode = (EPartyGameMode)SelectSlides[htSelectSlides(SelectSlideGameMode)].Selection;
 
-            if (_Base.Playlist.GetPlaylistSongCount(Data.ScreenConfig.PlaylistID) <= 0)
-                ConfigOk = false;
-            else
-                ConfigOk = true;
+            EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
+
+            switch (Data.ScreenConfig.GameMode)
+            {
+                case EPartyGameMode.TR_GAMEMODE_NORMAL:
+                    gm = EGameMode.TR_GAMEMODE_NORMAL;
+                    break;
+
+                case EPartyGameMode.TR_GAMEMODE_DUET:
+                    gm = EGameMode.TR_GAMEMODE_DUET;
+                    break;
+
+                case EPartyGameMode.TR_GAMEMODE_SHORTSONG:
+                    gm = EGameMode.TR_GAMEMODE_SHORTSONG;
+                    break;
+            }
+
+            if (Data.ScreenConfig.SongSource == ESongSource.TR_PLAYLIST)
+            {
+                if (_Base.Playlist.GetNumPlaylists() > 0)
+                    if (_Base.Playlist.GetPlaylistSongCount(Data.ScreenConfig.PlaylistID) > 0)
+                    {
+                        ConfigOk = false;
+                        for (int i = 0; i < _Base.Playlist.GetPlaylistSongCount(Data.ScreenConfig.PlaylistID); i++)
+                        {
+                            int id = _Base.Playlist.GetPlaylistSong(Data.ScreenConfig.PlaylistID, i).SongID;
+                            foreach (EGameMode mode in _Base.Songs.GetSongByID(id).AvailableGameModes)
+                                if (mode == gm)
+                                {
+                                    ConfigOk = true;
+                                    break;
+                                }
+                            if (ConfigOk)
+                                break;
+                        }
+                    }
+                    else
+                        ConfigOk = false;
+                else
+                    ConfigOk = false;
+            }
+            if (Data.ScreenConfig.SongSource == ESongSource.TR_CATEGORY)
+            {
+                if (_Base.Songs.GetNumCategories() > 0)
+                    if (_Base.Songs.NumSongsInCategory(Data.ScreenConfig.CategoryID) > 0)
+                    {
+                        _Base.Songs.SetCategory(Data.ScreenConfig.CategoryID);
+                        ConfigOk = false;
+                        for (int i = 0; i < _Base.Songs.NumSongsInCategory(Data.ScreenConfig.CategoryID); i++)
+                        {
+                            foreach (EGameMode mode in _Base.Songs.GetVisibleSong(i).AvailableGameModes)
+                                if (mode == gm)
+                                {
+                                    ConfigOk = true;
+                                    break;
+                                }
+                            if (ConfigOk)
+                                break;
+                        }
+                        _Base.Songs.SetCategory(-1);
+                    }
+                    else
+                        ConfigOk = false;
+                else
+                    ConfigOk = false;
+            }
+            if (Data.ScreenConfig.SongSource == ESongSource.TR_ALLSONGS)
+            {
+                if (_Base.Songs.GetNumSongs() > 0)
+                {
+                    for (int i = 0; i < _Base.Songs.GetNumSongs(); i++)
+                    {
+                        foreach (EGameMode mode in _Base.Songs.GetSongByID(i).AvailableGameModes)
+                            if (mode == gm)
+                            {
+                                ConfigOk = true;
+                                break;
+                            }
+                        if (ConfigOk)
+                            break;
+                    }
+                }
+                else
+                    ConfigOk = false;
+            }
+            SelectSlides[htSelectSlides(SelectSlideCategory)].Visible = Data.ScreenConfig.SongSource == ESongSource.TR_CATEGORY;
+            SelectSlides[htSelectSlides(SelectSlidePlaylist)].Visible = Data.ScreenConfig.SongSource == ESongSource.TR_PLAYLIST;
         }    
 
         private void Back()