diff --git a/Output/Languages/Deutsch.xml b/Output/Languages/Deutsch.xml
index be0b28c6..56978034 100644
--- a/Output/Languages/Deutsch.xml
+++ b/Output/Languages/Deutsch.xml
@@ -101,9 +101,12 @@
Profile
Spielerauswahl
- 1 Spieler
- 2 Spieler
- 3 Spieler
+ 1 Spieler
+ 2 Spieler
+ 3 Spieler
+ 4 Spieler
+ 5 Spieler
+ 6 Spieler
Warnung: Dem Spieler %v ist kein Mikrofon zugeordnet!
Warnung: Den Spielern %v sind keine Mikrofone zugeordnet!
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index 50a87ba8..0b543a31 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -101,9 +101,12 @@
Profiles
Player Selection
- 1 Player
- 2 Player
- 3 Player
+ 1 Player
+ 2 Player
+ 3 Player
+ 4 Player
+ 5 Player
+ 6 Player
Warning: There is no mic assigned to player %v!
Warning: There are no mics assigned to players %v!
diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml
index 2c2f7944..74c3e558 100644
--- a/Output/Languages/French.xml
+++ b/Output/Languages/French.xml
@@ -101,9 +101,12 @@
Profils
Sélection des joueurs
- 1 joueur
- 2 joueurs
- 3 joueurs
+ 1 joueur
+ 2 joueurs
+ 3 joueurs
+ 4 joueurs
+ 5 joueurs
+ 6 joueurs
Attention: Aucun micro n'est assigné au joueur %v!
Attention: Aucun micro n'est assigné aux joueurs %v!
diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index d304e24c..3516d39d 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -101,9 +101,12 @@
Perfiles
Selección de Jugadores
- Jugador 1
- Jugador 2
- Jugador 3
+ Jugador 1
+ Jugador 2
+ Jugador 3
+ Jugador 4
+ Jugador 5
+ Jugador 6
Advertencia: ¡No hay micrófonos asignados al jugador %v!
Advertencia: ¡No hay micrófonos asignados a los jugadores %v!
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index 20a2026b..516f554d 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -1,7 +1,7 @@
- 1
+ 2
Video
@@ -29,6 +29,102 @@
+
+
+ Button
+
+ 15
+ 100
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
+
+
+ Button
+
+ 15
+ 255
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
+
+
+ Button
+
+ 15
+ 410
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
+
+
+ Button
+
+ 1165
+ 100
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
+
+
+ Button
+
+ 1165
+ 255
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
+
+
+ Button
+
+ 1165
+ 410
+ 0,00
+ 100
+ 100
+
+
+ StaticColor
+
+
+
+
Invisible
@@ -72,6 +168,168 @@
+
+
+ 65
+ 203
+
+ 0,00
+
+ 20
+
+
+
+ Player1
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 65
+ 358
+
+ 0,00
+
+ 20
+
+
+
+ Player2
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 65
+ 513
+
+ 0,00
+
+ 20
+
+
+
+ Player3
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1205
+ 203
+
+ 0,00
+
+ 20
+
+
+
+ Player4
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1205
+ 358
+
+ 0,00
+
+ 20
+
+
+
+ Player5
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 1205
+ 513
+
+ 0,00
+
+ 20
+
+
+
+ Player6
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
640
@@ -210,148 +468,7 @@
26
-
-
- Button
-
- Button
-
- 145
- 150
- 0,00
- 150
- 50
-
-
- ButtonColor
-
-
- ButtonSColor
-
-
- 75
- 10
-
- 32
-
- 142
-
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
- Center
-
-
-
- Outline
-
- TR_SCREENNAMES_BUTTON_1PLAYER
-
-
-
-
-
-
-
-
-
-
- Button
-
- Button
-
- 145
- 315
- 0,00
- 150
- 50
-
-
- ButtonColor
-
-
- ButtonSColor
-
-
- 75
- 10
-
- 32
-
- 142
-
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
- Center
-
-
-
- Outline
-
- TR_SCREENNAMES_BUTTON_2PLAYER
-
-
-
-
-
-
-
-
-
-
- Button
-
- Button
-
- 145
- 480
- 0,00
- 150
- 50
-
-
- ButtonColor
-
-
- ButtonSColor
-
-
- 75
- 10
-
- 32
-
- 142
-
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
- Center
-
-
-
- Outline
-
- TR_SCREENNAMES_BUTTON_3PLAYER
-
-
-
-
-
-
-
-
-
+
Invisible
@@ -367,32 +484,32 @@
SelectSlidePlayer
- 305
- 100
+ 70
+ 545
0,00
- 905
- 150
+ 1140
+ 45
- 305
- 155
+ 75
+ 550
0,00
40
40
- 1180
- 155
+ 1170
+ 550
0,00
40
40
- Player1Dim
+ SelectSlideColor
- Player1Dim
+ SelectSlideSColor
- Player1
+ SelectSlideHColor
ArrowColor
@@ -404,7 +521,7 @@
TextColor
- Player1
+ TextSColor
32,00
@@ -415,136 +532,32 @@
Bold
6
-
-
-
- Invisible
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlidePlayer
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlidePlayer
-
- 305
- 265
- 0,00
- 905
- 150
-
- 305
- 320
- 0,00
- 40
- 40
-
- 1180
- 320
- 0,00
- 40
- 40
-
-
- Player2Dim
-
-
- Player2Dim
-
-
- Player2
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- Player2
-
- 32,00
-
- 186,00
-
- Outline
-
- Bold
-
- 6
-
-
-
- Invisible
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlidePlayer
-
- SelectSlideArrowLeft
-
- SelectSlideArrowRight
-
- SelectSlidePlayer
-
- 305
- 430
- 0,00
- 905
- 150
-
- 305
- 485
- 0,00
- 40
- 40
-
- 1180
- 485
- 0,00
- 40
- 40
-
-
- Player3Dim
-
-
- Player3Dim
-
-
- Player3
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- Player3
-
- 32,00
-
- 186,00
-
- Outline
-
- Bold
-
- 6
-
+
+
+ 150
+ 100
+ 0,00
+ 1020
+ 500
+ Button
+ SelectSlideSColor
+ Button
+ SelectSlideSColor
+
+ 100
+ 100
+ 8
+ 3
+ 15
+ 30
+
+ 2
+ Outline
+ TextColor
+
+ 15
+
+
+
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index 0e43d77c..06cbccf2 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -704,7 +704,7 @@
Bold
- 4
+ 7
@@ -769,7 +769,7 @@
Bold
- 4
+ 7
diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml
index 1673c63e..cb3ec553 100644
--- a/Output/Themes/Ambient/Screens/ScreenScore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenScore.xml
@@ -1,7 +1,7 @@
- 1
+ 2
Video
@@ -378,6 +378,831 @@
40
+
+
+ PointsBarBG
+
+ 190
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 190
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player1
+
+
+
+
+
+
+
+
+ 190
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 422
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 422
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player2
+
+
+
+
+
+
+
+
+ 422
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 654
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 1,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 654
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player3
+
+
+
+
+
+
+
+
+ 654
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 886
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,50
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 886
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player4
+
+
+
+
+
+
+
+
+ 886
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 352
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 352
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player1
+
+
+
+
+
+
+
+
+ 352
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player2
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 352
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 352
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player1
+
+
+
+
+
+
+
+
+ 352
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player4
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player5
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 352
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 352
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player1
+
+
+
+
+
+
+
+
+ 352
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player2
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 352
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 0,00
+ 0,00
+ 1,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 352
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player1
+
+
+
+
+
+
+
+
+ 352
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player4
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player5
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
+
+
+ PointsBarBG
+
+ 768
+ 180
+ 0,00
+ 160
+ 220
+
+
+ 1,00
+ 0,00
+ 0,00
+ 0,75
+
+
+
+
+
+
+ PointsBar
+
+ 768
+ 180
+ 0,00
+ 160
+ 0
+
+
+ Player6
+
+
+
+
+
+
+
+
+ 768
+ 410
+ 0,00
+ 160
+ 160
+
+
+ Visible
+
+
+
+
+ 15
+ 40
+
+
60
@@ -1080,5 +1905,1629 @@
+
+
+ 270
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 270
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 270
+ 105
+
+ 0,00
+
+ 32
+
+ 160
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 270
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 502
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 502
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 502
+ 105
+
+ 0,00
+
+ 32
+
+ 160
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 502
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 734
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 734
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 734
+ 105
+
+ 0,00
+
+ 32
+
+ 160
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 734
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 966
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 966
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 966
+ 105
+
+ 0,00
+
+ 32
+
+ 160
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 966
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 318
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 640
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 630
+
+ 0,00
+
+ 44
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 140
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 105
+
+ 0,00
+
+ 32
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
+
+
+ 962
+ 670
+
+ 0,00
+
+ 28
+
+
+
+ StaticColor
+
+
+ TextSColor
+
+ Center
+
+
+
+ Outline
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 5c85960a..1c4c98c0 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -1,7 +1,7 @@
- 3
+ 4
None
@@ -328,6 +328,246 @@
+
+
+ Score
+
+ 528
+ 150
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 350
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 150
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 350
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 10
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 210
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 410
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 150
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 350
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 10
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 210
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 528
+ 410
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 10
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 210
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
+
+
+ Score
+
+ 1150
+ 410
+ -0,75
+ 100
+ 50
+
+
+ StaticColor
+
+
+
+
640
@@ -572,6 +812,411 @@
+
+
+ 578
+ 155
+
+ -1,00
+
+ 40
+
+
+
+ Player1
+
+
+ Player1
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 355
+
+ -1,00
+
+ 40
+
+
+
+ Player2
+
+
+ Player2
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 155
+
+ -1,00
+
+ 40
+
+
+
+ Player3
+
+
+ Player3
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 355
+
+ -1,00
+
+ 40
+
+
+
+ Player4
+
+
+ Player4
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 15
+
+ -1,00
+
+ 40
+
+
+
+ Player1
+
+
+ Player1
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 215
+
+ -1,00
+
+ 40
+
+
+
+ Player2
+
+
+ Player2
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 415
+
+ -1,00
+
+ 40
+
+
+
+ Player3
+
+
+ Player3
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 155
+
+ -1,00
+
+ 40
+
+
+
+ Player4
+
+
+ Player4
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 355
+
+ -1,00
+
+ 40
+
+
+
+ Player5
+
+
+ Player5
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 15
+
+ -1,00
+
+ 40
+
+
+
+ Player1
+
+
+ Player1
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 215
+
+ -1,00
+
+ 40
+
+
+
+ Player2
+
+
+ Player2
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 578
+ 415
+
+ -1,00
+
+ 40
+
+
+
+ Player3
+
+
+ Player3
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 15
+
+ -1,00
+
+ 40
+
+
+
+ Player3
+
+
+ Player4
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 215
+
+ -1,00
+
+ 40
+
+
+
+ Player5
+
+
+ Player5
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
+
+
+ 1200
+ 415
+
+ -1,00
+
+ 40
+
+
+
+ Player6
+
+
+ Player6
+
+ Center
+
+
+
+ Normal
+
+
+
+
+
+
Button
@@ -819,7 +1464,82 @@
-0,50
1210
150
+ 35
+ 150
+ -0,50
+ 578
+ 175
+ 35
+ 350
+ -0,50
+ 578
+ 175
+ 678
+ 150
+ -0,50
+ 578
+ 175
+ 678
+ 350
+ -0,50
+ 578
+ 175
+ 35
+ 10
+ -0,50
+ 578
+ 150
+ 35
+ 210
+ -0,50
+ 578
+ 150
+ 35
+ 410
+ -0,50
+ 578
+ 150
+ 678
+ 150
+ -0,50
+ 578
+ 175
+ 678
+ 350
+ -0,50
+ 578
+ 175
+ 35
+ 10
+ -0,50
+ 578
+ 150
+ 35
+ 210
+ -0,50
+ 578
+ 150
+ 35
+ 410
+ -0,50
+ 578
+ 150
+ 678
+ 10
+ -0,50
+ 578
+ 150
+ 678
+ 210
+ -0,50
+ 578
+ 150
+ 678
+ 410
+ -0,50
+ 578
+ 150
-
\ No newline at end of file
+
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
index 62fefa5d..0e74cee0 100644
--- a/Output/Themes/Ambient/Skin Blue.xml
+++ b/Output/Themes/Ambient/Skin Blue.xml
@@ -214,13 +214,13 @@
0,300
1,000
-
- 0,800
+
+ 0,800
0,950
1,000
0,500
-
-
+
+
0,800
0,950
1,000
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
index 9d6047ae..f09b623f 100644
--- a/Output/Themes/Ambient/Skin Green.xml
+++ b/Output/Themes/Ambient/Skin Green.xml
@@ -214,13 +214,13 @@
0,300
1,000
-
- 0,800
+
+ 0,800
0,950
1,000
0,500
-
-
+
+
0,800
0,950
1,000
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
index b74a054b..1ab926eb 100644
--- a/Output/Themes/Ambient/Skin Red.xml
+++ b/Output/Themes/Ambient/Skin Red.xml
@@ -214,13 +214,13 @@
0,300
1,000
-
- 0,800
+
+ 0,800
0,950
1,000
0,500
-
-
+
+
0,800
0,950
1,000
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
index 5d63b033..8871e722 100644
--- a/Output/Themes/Ambient/Skin Yellow.xml
+++ b/Output/Themes/Ambient/Skin Yellow.xml
@@ -214,13 +214,13 @@
0,300
1,000
-
- 0,800
+
+ 0,800
0,950
1,000
0,500
-
-
+
+
0,800
0,950
1,000
diff --git a/Output/Themes/Changelog/Changelog_ScreenNames.txt b/Output/Themes/Changelog/Changelog_ScreenNames.txt
new file mode 100644
index 00000000..8db4f34f
--- /dev/null
+++ b/Output/Themes/Changelog/Changelog_ScreenNames.txt
@@ -0,0 +1,16 @@
+SceenNames
+
+++++++++++
+Version 2:
+
+Add:
+
+
+A new Theme-element for name-selecting.
+
+ (One Static for eacht player): Static wich shows the selected player and is used as drop-area
+ (One Text for each player): Text wich shows name of selected player
+
+
+Remove:
+, , , , ,
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenScore.txt b/Output/Themes/Changelog/Changelog_ScreenScore.txt
new file mode 100644
index 00000000..d050d838
--- /dev/null
+++ b/Output/Themes/Changelog/Changelog_ScreenScore.txt
@@ -0,0 +1,7 @@
+ScreenScore
+
+++++++++++
+Version 2:
+
+Add: Elements for up to 6 players! (Texts and statics!)
+++++++++++
\ No newline at end of file
diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt
index a1ea71f3..467cd165 100644
--- a/Output/Themes/Changelog/Changelog_ScreenSing.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt
@@ -1,5 +1,10 @@
ScreenSing
+++++++++++
+Version 4:
+Added Elements for 6-player-singing!
+
+
++++++++++
Version 3:
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 02ad6565..f8280487 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -400,6 +400,8 @@ namespace Vocaluxe.Base
#endregion Record
+ NumPlayer = 6;
+
return true;
}
else return false;
diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index 8446d7fa..69be5d2d 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -103,7 +103,7 @@ namespace Vocaluxe.Base
public static int MouseMoveDiffMin = 2;
public const float MouseMoveOffTime = 3f;
- public const int MaxNumPlayer = 3;
+ public const int MaxNumPlayer = 6;
public const int MaxScore = 10000;
public const int LinebonusScore = 1000;
public const int MinScoreForDB = 100;
diff --git a/Vocaluxe/Menu/CInteraction.cs b/Vocaluxe/Menu/CInteraction.cs
index 87cae837..5e21fdd9 100644
--- a/Vocaluxe/Menu/CInteraction.cs
+++ b/Vocaluxe/Menu/CInteraction.cs
@@ -13,7 +13,8 @@ namespace Vocaluxe.Menu
TStatic,
TSongMenu,
TLyric,
- TSingNote
+ TSingNote,
+ TNameSelection
}
class CInteraction
diff --git a/Vocaluxe/Menu/CMenu.cs b/Vocaluxe/Menu/CMenu.cs
index 282fb865..8effd14a 100644
--- a/Vocaluxe/Menu/CMenu.cs
+++ b/Vocaluxe/Menu/CMenu.cs
@@ -29,6 +29,7 @@ namespace Vocaluxe.Menu
private List _SongMenus;
private List _Lyrics;
private List _SingNotes;
+ private List _NameSelections;
private Hashtable _htBackgrounds;
private Hashtable _htStatics;
@@ -38,6 +39,7 @@ namespace Vocaluxe.Menu
private Hashtable _htLyrics;
private Hashtable _htSelectSlides;
private Hashtable _htSingNotes;
+ private Hashtable _htNameSelections;
private int _PrevMouseX;
@@ -58,6 +60,7 @@ namespace Vocaluxe.Menu
protected string[] _ThemeLyrics;
protected string[] _ThemeSelectSlides;
protected string[] _ThemeSingNotes;
+ protected string[] _ThemeNameSelections;
public int ThemeScreenVersion
{
@@ -82,6 +85,7 @@ namespace Vocaluxe.Menu
_SongMenus = new List();
_Lyrics = new List();
_SingNotes = new List();
+ _NameSelections = new List();
_htBackgrounds = new Hashtable();
_htStatics = new Hashtable();
@@ -91,6 +95,7 @@ namespace Vocaluxe.Menu
_htLyrics = new Hashtable();
_htSelectSlides = new Hashtable();
_htSingNotes = new Hashtable();
+ _htNameSelections = new Hashtable();
_PrevMouseX = 0;
_PrevMouseY = 0;
@@ -109,6 +114,7 @@ namespace Vocaluxe.Menu
_ThemeLyrics = null;
_ThemeSelectSlides = null;
_ThemeSingNotes = null;
+ _ThemeNameSelections = null;
}
#region ThemeHandler
@@ -275,6 +281,22 @@ namespace Vocaluxe.Menu
}
}
}
+
+ if (_ThemeNameSelections != null)
+ {
+ for (int i = 0; i < _ThemeNameSelections.Length; i++)
+ {
+ CNameSelection nsel = new CNameSelection();
+ if (nsel.LoadTheme("//root/" + _ThemeName, _ThemeNameSelections[i], navigator, SkinIndex))
+ {
+ _htNameSelections.Add(_ThemeNameSelections[i], AddNameSelection(nsel));
+ }
+ else
+ {
+ CLog.LogError("Can't load NameSelection \"" + _ThemeNameSelections[i] + "\" in screen " + _ThemeName);
+ }
+ }
+ }
}
else
{
@@ -344,6 +366,12 @@ namespace Vocaluxe.Menu
_SingNotes[i].SaveTheme(writer);
}
+ // NameSelections
+ for (int i = 0; i < _NameSelections.Count; i++)
+ {
+ _NameSelections[i].SaveTheme(writer);
+ }
+
writer.WriteEndElement();
// End of File
@@ -395,6 +423,11 @@ namespace Vocaluxe.Menu
{
sn.ReloadTextures();
}
+
+ foreach (CNameSelection ns in _NameSelections)
+ {
+ ns.ReloadTextures();
+ }
}
public virtual void UnloadTextures()
@@ -438,6 +471,13 @@ namespace Vocaluxe.Menu
{
sn.UnloadTextures();
}
+
+ foreach (CNameSelection ns in _NameSelections)
+ {
+ ns.UnloadTextures();
+ }
+
+
}
public virtual void ReloadTheme()
@@ -488,6 +528,11 @@ namespace Vocaluxe.Menu
{
return _SingNotes;
}
+
+ public List GetNameSelections()
+ {
+ return _NameSelections;
+ }
#endregion GetLists
#region ElementHandler
@@ -555,6 +600,14 @@ namespace Vocaluxe.Menu
return _SingNotes.ToArray();
}
}
+
+ public CNameSelection[] NameSelections
+ {
+ get
+ {
+ return _NameSelections.ToArray();
+ }
+ }
#endregion Get Arrays
#region Hashtables
@@ -661,6 +714,19 @@ namespace Vocaluxe.Menu
throw;
}
}
+
+ public int htNameSelections(string key)
+ {
+ try
+ {
+ return (int)_htNameSelections[key];
+ }
+ catch (Exception)
+ {
+ CLog.LogError("Can't find NameSelection Element \"" + key + "\" in Screen " + _ThemeName);
+ throw;
+ }
+ }
#endregion Hashtables
#endregion ElementHandler
@@ -922,6 +988,9 @@ namespace Vocaluxe.Menu
foreach (CText text in _Texts)
text.Draw();
+
+ foreach (CNameSelection namesel in _NameSelections)
+ namesel.Draw();
}
#endregion Drawing
@@ -981,6 +1050,13 @@ namespace Vocaluxe.Menu
AddInteraction(_SingNotes.Count - 1, EType.TSingNote);
return _SingNotes.Count - 1;
}
+
+ public int AddNameSelection(CNameSelection ns)
+ {
+ _NameSelections.Add(ns);
+ AddInteraction(_NameSelections.Count - 1, EType.TNameSelection);
+ return _NameSelections.Count - 1;
+ }
#endregion Elements
#region InteractionHandling
@@ -1459,6 +1535,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
_Lyrics[_Interactions[_Selection].Num].Selected = true;
break;
+ case EType.TNameSelection:
+ _NameSelections[_Interactions[_Selection].Num].Selected = true;
+ break;
}
}
@@ -1484,6 +1563,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
_Lyrics[_Interactions[_Selection].Num].Selected = false;
break;
+ case EType.TNameSelection:
+ _NameSelections[_Interactions[_Selection].Num].Selected = false;
+ break;
}
}
@@ -1512,6 +1594,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
//_Lyrics[_Interactions[selection].Num].Selected = true;
break;
+ case EType.TNameSelection:
+ //_NameSelections[_Interactions[selection].Num].Selected = true;
+ break;
}
}
@@ -1540,6 +1625,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
//_Lyrics[_Interactions[selection].Num].Selected = false;
break;
+ case EType.TNameSelection:
+ //_NameSelections[_Interactions[selection].Num].Selected = false;
+ break;
}
}
@@ -1587,6 +1675,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
return _Lyrics[_Interactions[interaction].Num].Visible;
+
+ case EType.TNameSelection:
+ return _NameSelections[_Interactions[interaction].Num].Visible;
}
return Result;
@@ -1614,6 +1705,9 @@ namespace Vocaluxe.Menu
case EType.TLyric:
return _Lyrics[_Interactions[interaction].Num].Rect;
+
+ case EType.TNameSelection:
+ return _NameSelections[_Interactions[interaction].Num].Rect;
}
return Result;
@@ -1660,6 +1754,10 @@ namespace Vocaluxe.Menu
case EType.TLyric:
_Lyrics[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
break;
+
+ case EType.TNameSelection:
+ _NameSelections[_Interactions[_Selection].Num].MoveElement(stepX, stepY);
+ break;
}
}
}
@@ -1693,6 +1791,10 @@ namespace Vocaluxe.Menu
case EType.TLyric:
_Lyrics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
break;
+
+ case EType.TNameSelection:
+ _NameSelections[_Interactions[_Selection].Num].ResizeElement(stepW, stepH);
+ break;
}
}
}
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index fb209c32..083cddf1 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -12,14 +12,24 @@ namespace Vocaluxe.Screens
class CScreenNames : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 1;
+ const int ScreenVersion = 2;
- private readonly string[] SelectSlidePlayerMic = new string[] { "SelectSlidePlayerMic1", "SelectSlidePlayerMic2", "SelectSlidePlayerMic3" };
- private readonly string[] ButtonPlayer = new string[] { "Button1Player", "Button2Player", "Button3Player" };
+ private CStatic chooseAvatarStatic;
+ private int OldMouseX;
+ private int OldMouseY;
+
+ private const string SelectSlidePlayerNumber = "SelectSlidePlayerNumber";
+ private const string NameSelection = "NameSelection";
private const string ButtonBack = "ButtonBack";
private const string ButtonStart = "ButtonStart";
private const string TextWarning = "TextWarning";
private const string StaticWarning = "StaticWarning";
+ private readonly string[] StaticPlayer = new string[] {"StaticPlayer1", "StaticPlayer2", "StaticPlayer3", "StaticPlayer4", "StaticPlayer5", "StaticPlayer6"};
+ private readonly string[] TextPlayer = new string[] { "TextPlayer1", "TextPlayer2", "TextPlayer3", "TextPlayer4", "TextPlayer5", "TextPlayer6" };
+
+ private bool selectingMouseActive = false;
+ private int SelectedPlayerNr;
+
private int[] _PlayerNr;
@@ -36,38 +46,40 @@ namespace Vocaluxe.Screens
_ScreenVersion = ScreenVersion;
List statics = new List();
+ foreach(string text in StaticPlayer){
+ statics.Add(text);
+ }
statics.Add(StaticWarning);
_ThemeStatics = statics.ToArray();
List texts = new List();
- foreach (string text in SelectSlidePlayerMic)
- {
- texts.Add(text);
- }
- _ThemeSelectSlides = texts.ToArray();
+
+ _ThemeSelectSlides = new string[] { SelectSlidePlayerNumber };
texts.Clear();
texts.Add(TextWarning);
+ foreach(string text in TextPlayer){
+ texts.Add(text);
+ }
_ThemeTexts = texts.ToArray();
texts.Clear();
texts.Add(ButtonBack);
texts.Add(ButtonStart);
- foreach (string text in ButtonPlayer)
- {
- texts.Add(text);
- }
+
_ThemeButtons = texts.ToArray();
+
+ texts.Clear();
+ texts.Add(NameSelection);
+ _ThemeNameSelections = texts.ToArray();
+
+ chooseAvatarStatic = new CStatic();
+ chooseAvatarStatic.Visible = false;
}
public override void LoadTheme()
{
base.LoadTheme();
-
- for (int i = 0; i < SelectSlidePlayerMic.Length; i++)
- {
- SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].WithTextures = true;
- }
_PlayerNr = new int[CSettings.MaxNumPlayer];
for (int i = 0; i < _PlayerNr.Length; i++)
@@ -95,25 +107,6 @@ namespace Vocaluxe.Screens
break;
case Keys.Enter:
-
- for (int i = 0; i < ButtonPlayer.Length; i++)
- {
- if (Buttons[htButtons(ButtonPlayer[i])].Selected)
- {
- processed = true;
- CGame.NumPlayer = i + 1;
-
- UpdateSelection();
- UpdateVisibility();
-
- CConfig.NumPlayer = CGame.NumPlayer;
- CConfig.SaveConfig();
-
- CheckMics();
-
- break;
- }
- }
if (!processed && Buttons[htButtons(ButtonBack)].Selected)
{
@@ -141,6 +134,75 @@ namespace Vocaluxe.Screens
{
base.HandleMouse(MouseEvent);
+ //Check if LeftButton is hold and Select-Mode inactive
+ if (MouseEvent.LBH && !selectingMouseActive)
+ {
+ //Save mouse-coords
+ OldMouseX = MouseEvent.X;
+ OldMouseY = MouseEvent.Y;
+ //Check if mouse if over tile
+ if (NameSelections[htNameSelections(NameSelection)].isOverTile(OldMouseX, OldMouseY))
+ {
+ //Get player-number of tile
+ SelectedPlayerNr = NameSelections[htNameSelections(NameSelection)].TilePlayerNr(OldMouseX, OldMouseY);
+ if (SelectedPlayerNr != -1)
+ {
+ //Activate mouse-selecting
+ selectingMouseActive = true;
+
+ //Update of Drag/Drop-Texture
+ CStatic SelectedPlayer = NameSelections[htNameSelections(NameSelection)].TilePlayerAvatar(OldMouseX, OldMouseY);
+ chooseAvatarStatic.Visible = true;
+ chooseAvatarStatic.Rect = SelectedPlayer.Rect;
+ chooseAvatarStatic.Rect.Z = CSettings.zNear - 5;
+ chooseAvatarStatic.Color = new SColorF(1, 1, 1, 1);
+ chooseAvatarStatic.Texture = SelectedPlayer.Texture;
+ }
+ }
+ }
+
+ //Check if LeftButton is hold and Select-Mode active
+ if (MouseEvent.LBH && selectingMouseActive)
+ {
+ //Update coords for Drag/Drop-Texture
+ chooseAvatarStatic.Rect.X += (MouseEvent.X - OldMouseX);
+ chooseAvatarStatic.Rect.Y += (MouseEvent.Y - OldMouseY);
+ OldMouseX = MouseEvent.X;
+ OldMouseY = MouseEvent.Y;
+ }
+ // LeftButton isn't hold anymore, but Selec-Mode is still active -> "Drop" of Avatar
+ else if (selectingMouseActive)
+ {
+ //Check if really a player was selected
+ if (SelectedPlayerNr != -1)
+ {
+ //Foreach Drop-Area
+ for (int i = 0; i < StaticPlayer.Length; i++)
+ {
+ //Check first, if area is "active"
+ if (Statics[htStatics(StaticPlayer[i])].Visible == true)
+ {
+ //Check if Mouse is in area
+ if (Statics[htStatics(StaticPlayer[i])].Rect.X < MouseEvent.X && (Statics[htStatics(StaticPlayer[i])].Rect.X + Statics[htStatics(StaticPlayer[i])].Rect.W) > MouseEvent.X
+ && Statics[htStatics(StaticPlayer[i])].Rect.Y < MouseEvent.Y && (Statics[htStatics(StaticPlayer[i])].Rect.Y + Statics[htStatics(StaticPlayer[i])].Rect.H) > MouseEvent.Y)
+ {
+ //Update Game-infos with new player
+ CGame.Player[i].Name = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
+ CGame.Player[i].Difficulty = CProfiles.Profiles[SelectedPlayerNr].Difficulty;
+ CGame.Player[i].ProfileID = SelectedPlayerNr;
+ //Update texture and name
+ Statics[htStatics(StaticPlayer[i])].Texture = chooseAvatarStatic.Texture;
+ Texts[htTexts(TextPlayer[i])].Text = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
+ }
+ }
+ }
+ SelectedPlayerNr = -1;
+ }
+ //Reset variables
+ selectingMouseActive = false;
+ chooseAvatarStatic.Visible = false;
+ }
+
if (MouseEvent.LB && IsMouseOver(MouseEvent))
{
@@ -149,24 +211,6 @@ namespace Vocaluxe.Screens
if (MouseEvent.LB && IsMouseOver(MouseEvent))
{
bool processed = false;
- for (int i = 0; i < ButtonPlayer.Length; i++)
- {
- if (Buttons[htButtons(ButtonPlayer[i])].Selected)
- {
- processed = true;
- CGame.NumPlayer = i + 1;
-
- UpdateSelection();
- UpdateVisibility();
-
- CConfig.NumPlayer = CGame.NumPlayer;
- CConfig.SaveConfig();
-
- CheckMics();
-
- break;
- }
- }
if (!processed && Buttons[htButtons(ButtonBack)].Selected)
{
@@ -182,6 +226,7 @@ namespace Vocaluxe.Screens
if (!processed)
UpdateSelection();
+ UpdatePlayerNumber();
}
if (MouseEvent.RB)
@@ -201,6 +246,8 @@ namespace Vocaluxe.Screens
{
base.OnShow();
+ NameSelections[htNameSelections(NameSelection)].Init();
+
UpdateSlides();
UpdateVisibility();
CheckMics();
@@ -208,26 +255,34 @@ namespace Vocaluxe.Screens
public override bool Draw()
{
- return base.Draw();
+ base.Draw();
+
+ if (chooseAvatarStatic.Visible)
+ {
+ chooseAvatarStatic.Draw();
+ }
+
+ return true;
}
private void StartSong()
{
for (int i = 0; i < CGame.NumPlayer; i++)
{
- if (CProfiles.Profiles.Length > 0)
- {
- int pIndex = SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].ValueIndex;
- CGame.Player[i].Name = CProfiles.Profiles[pIndex].PlayerName;
- CGame.Player[i].Difficulty = CProfiles.Profiles[pIndex].Difficulty;
- CGame.Player[i].ProfileID = pIndex;
- }
- else
+ if (CGame.Player[i].ProfileID < 0)
{
CGame.Player[i].Name = "Player " + i.ToString();
CGame.Player[i].Difficulty = EGameDifficulty.TR_CONFIG_EASY;
CGame.Player[i].ProfileID = -1;
}
+ else
+ {
+ //Just a work-around for not crashing the game
+ if (CGame.Player[i].Name == null)
+ {
+ CGame.Player[i].Name = "";
+ }
+ }
}
CGraphics.FadeTo(EScreens.ScreenSing);
@@ -235,51 +290,50 @@ namespace Vocaluxe.Screens
private void UpdateSlides()
{
- for (int i = 0; i < SelectSlidePlayerMic.Length; i++)
+ SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Clear();
+ for (int i = 1; i <= CSettings.MaxNumPlayer; i++)
{
- SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].Clear();
- }
-
- for (int i = 0; i < CProfiles.NumProfiles; i++)
- {
- if (CProfiles.Profiles[i].Active == EOffOn.TR_CONFIG_ON)
- {
- for (int p = 0; p < SelectSlidePlayerMic.Length; p++)
- {
- SelectSlides[htSelectSlides(SelectSlidePlayerMic[p])].AddValue(CProfiles.Profiles[i].PlayerName, CProfiles.Profiles[i].Avatar.Texture, i);
- }
- }
- }
-
- for (int i = 0; i < _PlayerNr.Length; i++)
- {
- if (i < SelectSlidePlayerMic.Length)
- {
- if (_PlayerNr[i] < CProfiles.NumProfiles && _PlayerNr[i] >= 0)
- {
- SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].Selection = _PlayerNr[i];
- }
- }
+ SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].AddValue(CLanguage.Translate("TR_SCREENNAMES_" + i + "PLAYER"));
}
+ SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection = CConfig.NumPlayer - 1;
}
private void UpdateSelection()
{
for (int i = 0; i < _PlayerNr.Length; i++)
{
- if (i < SelectSlidePlayerMic.Length)
+
+ }
+ }
+
+ private void UpdatePlayerNumber()
+ {
+ if (CConfig.NumPlayer != (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1)
+ {
+ CConfig.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
+ CGame.NumPlayer = (int)SelectSlides[htSelectSlides(SelectSlidePlayerNumber)].Selection + 1;
+ for (int i = 1; i <= CSettings.MaxNumPlayer; i++)
{
- _PlayerNr[i] = SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].Selection;
+ if (i <= CGame.NumPlayer)
+ {
+ Statics[htStatics("StaticPlayer" + i)].Visible = true;
+ Texts[htTexts("TextPlayer" + i)].Visible = true;
+ }
+ else
+ {
+ Statics[htStatics("StaticPlayer" + i)].Visible = false;
+ Texts[htTexts("TextPlayer" + i)].Visible = false;
+ }
}
+ CConfig.SaveConfig();
+ CheckMics();
+
}
}
private void UpdateVisibility()
{
- for (int i = 0; i < SelectSlidePlayerMic.Length; i++)
- {
- SelectSlides[htSelectSlides(SelectSlidePlayerMic[i])].Visible = i < CGame.NumPlayer;
- }
+
}
private void CheckMics()
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index bb6287c5..eb7bf9b8 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -15,7 +15,7 @@ namespace Vocaluxe.Screens
class CScreenScore : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 1;
+ const int ScreenVersion = 2;
private const string TextSong = "TextSong";
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 415a7bd9..fc90a9d5 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
class CScreenSing : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- const int ScreenVersion = 3;
+ const int ScreenVersion = 4;
struct TimeRect
{
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 0c3b8104..6dc4fbe4 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -165,6 +165,7 @@
+