merged lua into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2071 b956fd51-792f-4845-bead-9b4dfca2ff2c

8 files changed, 429 insertions, 135 deletions

diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index cf3ad368..2cf29024 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -2526,7 +2526,7 @@ Color = White
 Font = 0
 Size = 30
 Align = 0
-Text = 
+Text =
 
 [OptionsStatic2]
 X = 0
@@ -4203,7 +4203,7 @@ Text = SING_LEGEND_ESC
 #DColor = ColorLight
 #TColor = White
 #TDColor = White
- 
+
 #SBGColor = DarkBlue
 #SBGDColor = LightBlue
 #STColor = White
@@ -6688,41 +6688,46 @@ Text = SING_LEGEND_CONTINUE
 Tex = MainBar
 TexSBG = SelectBG
 Text = PARTY_DIFFICULTY
-X = 40
-Y = 85
+X = 70
+Y = 100
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 Fields = 1
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
+#TexSBG = SelectBG
+#W = 230
+#H = 40
+#SkipX = 10
+
 [PartyOptionsSelectPlayList]
 Tex = MainBar
 TexSBG = SelectBG
 Text = PARTY_PLAYLIST
-X = 40
-Y = 140
+X = 70
+Y = 155
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 Fields = 1
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
@@ -6730,20 +6735,20 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = PARTY_PLAYLIST
-X = 40
-Y = 195
+X = 70
+Y = 210
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 Fields = 1
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
@@ -6751,104 +6756,20 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = PARTY_ROUNDS
-X = 40
+X = 70
 Y = 250
 W = 230
-H = 70
-SkipX = 50
-Fields = 7
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
-[PartyOptionsSelectTeams]
-Tex = MainBar
-TexSBG = SelectBG
-Text = PARTY_TEAMS
-X = 40
-Y = 305
-W = 230
-H = 70
-SkipX = 50
-Fields = 7
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
-[PartyOptionsSelectPlayers1]
-Tex = MainBar
-TexSBG = SelectBG
-Text = PARTY_TEAMS_PLAYER1
-X = 40
-Y = 360
-W = 230
-H = 70
-SkipX = 50
-Fields = 7
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
-[PartyOptionsSelectPlayers2]
-Tex = MainBar
-TexSBG = SelectBG
-Text = PARTY_TEAMS_PLAYER2
-X = 40
-Y = 415
-W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 Fields = 7
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
 
-[PartyOptionsSelectPlayers3]
-Tex = MainBar
-TexSBG = SelectBG
-Text = PARTY_TEAMS_PLAYER3
-X = 40
-Y = 470
-W = 230
-H = 70
-SkipX = 50
-Fields = 7
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
@@ -6863,6 +6784,7 @@ Tex = PartyBG
 [PartyPlayerStatic1]
 X = 0
 Y = 545
+Z = 0.7
 W = 250
 H = 30
 Tex = Leiste1
@@ -6874,6 +6796,7 @@ ReflectionSpacing = 2
 [PartyPlayerStatic2]
 X = 250
 Y = 545
+Z = 0.7
 W = 550
 H = 30
 Tex = Leiste2
@@ -6894,6 +6817,7 @@ Type = Colorized
 [PartyPlayerStatic4]
 X = 260
 Y = 552
+Z = 0.75
 W = 24
 H = 23
 Tex = ButtonNavi
@@ -6903,6 +6827,7 @@ Type = Transparent
 [PartyPlayerStatic5]
 X = 388
 Y = 552
+Z = 0.75
 W = 32
 H = 23
 Tex = ButtonAZ
@@ -6912,6 +6837,7 @@ Type = Transparent
 [PartyPlayerStatic6]
 X = 556
 Y = 552
+Z = 0.75
 W = 24
 H = 23
 Tex = ButtonEnter
@@ -6972,12 +6898,100 @@ Color = Black
 Font = 0
 Size = 21
 Align = 0
-Text = PARTY_PLAYER_LEGEND_CONTINUE
+Text = SING_LEGEND_CONTINUE
+
+[PartyPlayerSelectTeams]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_TEAMS
+X = 85
+Y = 90
+W = 220
+H = 40
+SkipX = 10
+Fields = 2
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyPlayerSelectPlayers1]
+Tex = MainBar
+TexSBG = PartyPlayerSelectBG
+Text = PARTY_TEAMS_PLAYER1
+X = 405
+Y = 145
+W = 200
+SBGW = 100
+H = 40
+SkipX = 10
+Fields = 1
+
+Color = P1Lightest
+DColor = P1Light
+TColor = White
+TDColor = White
+
+SBGColor = P1Lightest
+SBGDColor = P1Light
+STColor = White
+STDColor = GrayDark
+
+[PartyPlayerSelectPlayers2]
+Tex = MainBar
+TexSBG = PartyPlayerSelectBG
+Text = PARTY_TEAMS_PLAYER2
+X = 405
+Y = 285
+W = 200
+SBGW = 100
+H = 40
+SkipX = 10
+Fields = 1
+
+Color = P2Lightest
+DColor = P2Light
+TColor = White
+TDColor = White
+
+SBGColor = P2Lightest
+SBGDColor = P2Light
+STColor = White
+STDColor = GrayDark
+
+[PartyPlayerSelectPlayers3]
+Tex = MainBar
+TexSBG = PartyPlayerSelectBG
+Text = PARTY_TEAMS_PLAYER3
+X = 405
+Y = 425
+W = 200
+SBGW = 100
+H = 40
+SkipX = 10
+Fields = 4
+
+Color = P3Lightest
+DColor = P3Light
+TColor = White
+TDColor = White
+
+SBGColor = P3Lightest
+SBGDColor = P3Light
+STColor = White
+STDColor = GrayDark
+
 
 [PartyPlayerTeam1Name]
 Tex = PartyTeamButton2
 X = 85
-Y = 100
+Y = 140
 W = 310
 H = 50
 Type = Colorized
@@ -6997,7 +7011,7 @@ Color = White
 [PartyPlayerPlayer1Name]
 Tex = Button
 X = 85
-Y = 160
+Y = 200
 W = 150
 H = 50
 Type = Transparent
@@ -7019,7 +7033,7 @@ Color = White
 [PartyPlayerPlayer2Name]
 Tex = Button
 X = 245
-Y = 160
+Y = 200
 W = 150
 H = 50
 Type = Transparent
@@ -7041,7 +7055,7 @@ Color = White
 [PartyPlayerPlayer3Name]
 Tex = Button
 X = 405
-Y = 160
+Y = 200
 W = 150
 H = 50
 Type = Transparent
@@ -7063,7 +7077,7 @@ Color = White
 [PartyPlayerPlayer4Name]
 Tex = Button
 X = 565
-Y = 160
+Y = 200
 W = 150
 H = 50
 Type = Transparent
@@ -7085,7 +7099,7 @@ Color = White
 [PartyPlayerTeam2Name]
 Tex = PartyTeamButton2
 X = 85
-Y = 240
+Y = 280
 W = 310
 H = 50
 Type = Colorized
@@ -7105,7 +7119,7 @@ Color = White
 [PartyPlayerPlayer5Name]
 Tex = Button
 X = 85
-Y = 300
+Y = 340
 W = 150
 H = 50
 Type = Transparent
@@ -7127,7 +7141,7 @@ Color = White
 [PartyPlayerPlayer6Name]
 Tex = Button
 X = 245
-Y = 300
+Y = 340
 W = 150
 H = 50
 Type = Transparent
@@ -7149,7 +7163,7 @@ Color = White
 [PartyPlayerPlayer7Name]
 Tex = Button
 X = 405
-Y = 300
+Y = 340
 W = 150
 H = 50
 Type = Transparent
@@ -7171,7 +7185,7 @@ Color = White
 [PartyPlayerPlayer8Name]
 Tex = Button
 X = 565
-Y = 300
+Y = 340
 W = 150
 H = 50
 Type = Transparent
@@ -7193,10 +7207,10 @@ Color = White
 [PartyPlayerTeam3Name]
 Tex = PartyTeamButton2
 X = 85
-Y = 380
+Y = 420
 W = 310
 H = 50
-Type = Transparent
+Type = Colorized
 Texts = 1
 Color = P3Lightest
 DColor = P3Dark
@@ -7213,7 +7227,8 @@ Color = White
 [PartyPlayerPlayer9Name]
 Tex = Button
 X = 85
-Y = 440
+Y = 480
+Z = 0.6
 W = 150
 H = 50
 Type = Transparent
@@ -7235,7 +7250,8 @@ Color = White
 [PartyPlayerPlayer10Name]
 Tex = Button
 X = 245
-Y = 440
+Y = 480
+Z = 0.6
 W = 150
 H = 50
 Type = Transparent
@@ -7257,7 +7273,8 @@ Color = White
 [PartyPlayerPlayer11Name]
 Tex = Button
 X = 405
-Y = 440
+Y = 480
+Z = 0.6
 W = 150
 H = 50
 Type = Transparent
@@ -7279,7 +7296,8 @@ Color = White
 [PartyPlayerPlayer12Name]
 Tex = Button
 X = 565
-Y = 440
+Y = 480
+Z = 0.6
 W = 150
 H = 50
 Type = Transparent
@@ -7298,6 +7316,277 @@ Align = 1
 Text = Player 12
 Color = White
 
+
+
+[PartyRoundsBackground]
+Tex = PartyBG
+
+[PartyRoundsStatic1]
+X = 0
+Y = 545
+W = 250
+H = 30
+Tex = Leiste1
+Color = ColorLight
+Type = Colorized
+Reflection = 1
+ReflectionSpacing = 2
+
+[PartyRoundsStatic2]
+X = 250
+Y = 545
+W = 550
+H = 30
+Tex = Leiste2
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[PartyRoundsStatic3]
+X = 40
+Y = 22
+W = 27
+H = 27
+Color = White
+Tex = PartyIcon
+Type = Colorized
+
+[PartyRoundsStatic4]
+X = 260
+Y = 552
+W = 24
+H = 23
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+
+[PartyRoundsStatic5]
+X = 388
+Y = 552
+W = 24
+H = 23
+Tex = ButtonEnter
+Color = White
+Type = Transparent
+
+[PartyRoundsText1]
+X = 70
+Y = 6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 60
+Color = White
+Text = PARTY_MODE
+
+[PartyRoundsText2]
+X = 70
+Y = 53
+Color = White
+Font = 0
+Size = 30
+Align = 0
+Text = PARTY_ROUNDS_DESC
+
+[PartyRoundsText3]
+X = 238
+Y = 552
+Color = Black
+Font = 0
+Size = 21
+Align = 2
+Text = PARTY_ROUNDS_WHEREAMI
+
+[PartyRoundsText4]
+X = 294
+Y = 552
+Color = Black
+Font = 0
+Size = 21
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+
+[PartyRoundsText5]
+X = 418
+Y = 552
+Color = Black
+Font = 0
+Size = 21
+Align = 0
+Text = PARTY_ROUNDS_LEGEND_CONTINUE
+
+[PartyRoundsSelectRoundCount]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_ROUNDCOUNT
+X = 70
+Y = 100
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound1]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE1
+X = 70
+Y = 155
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound2]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE2
+X = 70
+Y = 210
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound3]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE3
+X = 70
+Y = 265
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound4]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE4
+X = 70
+Y = 320
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound5]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE5
+X = 70
+Y = 375
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound6]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE6
+X = 70
+Y = 430
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+[PartyRoundsSelectRound7]
+Tex = MainBar
+TexSBG = SelectBG
+Text = PARTY_SELECTMODE7
+X = 70
+Y = 485
+W = 230
+H = 40
+SkipX = 10
+Fields = 7
+
+Color = ColorDark
+DColor = ColorLight
+TColor = White
+TDColor = White
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
+STColor = White
+STDColor = GrayDark
+
+
+
 [SongMenu]
 
 [SongMenuBackground]
@@ -7425,7 +7714,7 @@ Z = 0.97
 # TODO: why is this here?
 #[SongMenuSelectSlide1]
 #Tex = Rectangle
-#TexSBG = Top5BG 
+#TexSBG = Top5BG
 #Text =lalalalalalalala
 #Type
 #X = 524
diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 10017fb3..79bac299 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -160,6 +160,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
+PartyPlayerSelectBG = [party]playerselectbg.png
 
 
 # # # S T A T S # # #
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 38f25cdb..602a720b 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -160,6 +160,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
+PartyPlayerSelectBG = [party]playerselectbg.png
 
 
 # # # S T A T S # # #
diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index d18c7a60..a7f59bad 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -140,6 +140,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
+PartyPlayerSelectBG = [party]playerselectbg.png
 
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
diff --git a/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index 73cae2ab..2f61fd1c 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -160,7 +160,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png

 PartyWinDeco2     =[party]winDecoration.png

 PartyWinDeco3     =[party]winDecoration.png

-

+PartyPlayerSelectBG = [party]playerselectbg.png

 

 # # # S T A T S # # #

 StatMainBG1 = [stat]mainBG1.png

diff --git a/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index 36e9f5d7..d254e14d 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -160,6 +160,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
+PartyPlayerSelectBG = [party]playerselectbg.png
 
 
 # # # S T A T S # # #
diff --git a/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 72514a15..85173278 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -160,6 +160,7 @@ PartyScoreBG2     =[party]scoreBG2.png
 PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
+PartyPlayerSelectBG = [party]playerselectbg.png
 
 
 # # # S T A T S # # #
diff --git a/game/themes/Deluxe/[party]playerselectbg.png b/game/themes/Deluxe/[party]playerselectbg.png
new file mode 100644
index 00000000..cc608229
--- /dev/null
+++ b/game/themes/Deluxe/[party]playerselectbg.png