From d306e0e69b740b3f9da01c676ed89f009d725ff5 Mon Sep 17 00:00:00 2001
From: mogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 14 Apr 2007 20:18:30 +0000
Subject: Theme/Skin: Huge cleanup (still not finished), score screen almost
 done (1P done), used new reflection possibility for menu bar

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@90 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Skins/Deluxe/MainBG_W&C.jpg              | Bin 169028 -> 0 bytes
 Skins/Deluxe/Note Star.jpg               | Bin 22332 -> 0 bytes
 Skins/Deluxe/NotePerfectStar.jpg         | Bin 27633 -> 0 bytes
 Skins/Deluxe/Score Level Round.jpg       | Bin 616 -> 19455 bytes
 Skins/Deluxe/Score Level.jpg             | Bin 1245 -> 1264 bytes
 Skins/Deluxe/Song Selection1.jpg         | Bin 26572 -> 0 bytes
 Skins/Deluxe/Song Selection2.jpg         | Bin 1031 -> 0 bytes
 Skins/Deluxe/SongMenuBG.jpg              | Bin 5287 -> 0 bytes
 Skins/Deluxe/W&C.ini                     |  67 +--
 Skins/Deluxe/W&C.jpg                     | Bin 169028 -> 0 bytes
 Skins/Deluxe/[bg-load]summer.jpg         | Bin 0 -> 90358 bytes
 Skins/Deluxe/[bg-main]summer.jpg         | Bin 0 -> 65991 bytes
 Skins/Deluxe/[effect]goldenNoteStar.jpg  | Bin 0 -> 22332 bytes
 Skins/Deluxe/[effect]perfectNoteStar.jpg | Bin 0 -> 27633 bytes
 Skins/Deluxe/[icon]score.jpg             | Bin 0 -> 1150 bytes
 Skins/Deluxe/[main]playerNumberBox.jpg   | Bin 0 -> 1071 bytes
 Skins/Deluxe/[main]scoreLine.jpg         | Bin 0 -> 19965 bytes
 Skins/Deluxe/[main]songSelection1.jpg    | Bin 0 -> 1818 bytes
 Skins/Deluxe/[main]songSelection2.jpg    | Bin 0 -> 1031 bytes
 Skins/Deluxe/[menu]jumpToBg.jpg          | Bin 0 -> 1870 bytes
 Skins/Deluxe/[menu]songMenuBg.jpg        | Bin 0 -> 5287 bytes
 Skins/Deluxe/[score]endcap.jpg           | Bin 0 -> 984 bytes
 Skins/Deluxe/[special]bar1.jpg           | Bin 0 -> 1128 bytes
 Skins/Deluxe/[special]bar2.jpg           | Bin 0 -> 950 bytes
 Skins/Deluxe/jump_to_background.jpg      | Bin 1870 -> 0 bytes
 Skins/Deluxe/leiste1.jpg                 | Bin 1128 -> 0 bytes
 Skins/Deluxe/leiste2.jpg                 | Bin 950 -> 0 bytes
 Themes/Deluxe.ini                        | 681 ++++++++++++++++++++-----------
 28 files changed, 479 insertions(+), 269 deletions(-)
 delete mode 100644 Skins/Deluxe/MainBG_W&C.jpg
 delete mode 100644 Skins/Deluxe/Note Star.jpg
 delete mode 100644 Skins/Deluxe/NotePerfectStar.jpg
 delete mode 100644 Skins/Deluxe/Song Selection1.jpg
 delete mode 100644 Skins/Deluxe/Song Selection2.jpg
 delete mode 100644 Skins/Deluxe/SongMenuBG.jpg
 delete mode 100644 Skins/Deluxe/W&C.jpg
 create mode 100644 Skins/Deluxe/[bg-load]summer.jpg
 create mode 100644 Skins/Deluxe/[bg-main]summer.jpg
 create mode 100644 Skins/Deluxe/[effect]goldenNoteStar.jpg
 create mode 100644 Skins/Deluxe/[effect]perfectNoteStar.jpg
 create mode 100644 Skins/Deluxe/[icon]score.jpg
 create mode 100644 Skins/Deluxe/[main]playerNumberBox.jpg
 create mode 100644 Skins/Deluxe/[main]scoreLine.jpg
 create mode 100644 Skins/Deluxe/[main]songSelection1.jpg
 create mode 100644 Skins/Deluxe/[main]songSelection2.jpg
 create mode 100644 Skins/Deluxe/[menu]jumpToBg.jpg
 create mode 100644 Skins/Deluxe/[menu]songMenuBg.jpg
 create mode 100644 Skins/Deluxe/[score]endcap.jpg
 create mode 100644 Skins/Deluxe/[special]bar1.jpg
 create mode 100644 Skins/Deluxe/[special]bar2.jpg
 delete mode 100644 Skins/Deluxe/jump_to_background.jpg
 delete mode 100644 Skins/Deluxe/leiste1.jpg
 delete mode 100644 Skins/Deluxe/leiste2.jpg

diff --git a/Skins/Deluxe/MainBG_W&C.jpg b/Skins/Deluxe/MainBG_W&C.jpg
deleted file mode 100644
index 79f72163..00000000
Binary files a/Skins/Deluxe/MainBG_W&C.jpg and /dev/null differ
diff --git a/Skins/Deluxe/Note Star.jpg b/Skins/Deluxe/Note Star.jpg
deleted file mode 100644
index 1ef6243d..00000000
Binary files a/Skins/Deluxe/Note Star.jpg and /dev/null differ
diff --git a/Skins/Deluxe/NotePerfectStar.jpg b/Skins/Deluxe/NotePerfectStar.jpg
deleted file mode 100644
index 189a22a3..00000000
Binary files a/Skins/Deluxe/NotePerfectStar.jpg and /dev/null differ
diff --git a/Skins/Deluxe/Score Level Round.jpg b/Skins/Deluxe/Score Level Round.jpg
index dbc5b5af..4edcdd69 100644
Binary files a/Skins/Deluxe/Score Level Round.jpg and b/Skins/Deluxe/Score Level Round.jpg differ
diff --git a/Skins/Deluxe/Score Level.jpg b/Skins/Deluxe/Score Level.jpg
index e47280cb..9e9c4086 100644
Binary files a/Skins/Deluxe/Score Level.jpg and b/Skins/Deluxe/Score Level.jpg differ
diff --git a/Skins/Deluxe/Song Selection1.jpg b/Skins/Deluxe/Song Selection1.jpg
deleted file mode 100644
index c26b3fcb..00000000
Binary files a/Skins/Deluxe/Song Selection1.jpg and /dev/null differ
diff --git a/Skins/Deluxe/Song Selection2.jpg b/Skins/Deluxe/Song Selection2.jpg
deleted file mode 100644
index cb3a3396..00000000
Binary files a/Skins/Deluxe/Song Selection2.jpg and /dev/null differ
diff --git a/Skins/Deluxe/SongMenuBG.jpg b/Skins/Deluxe/SongMenuBG.jpg
deleted file mode 100644
index ef530ef5..00000000
Binary files a/Skins/Deluxe/SongMenuBG.jpg and /dev/null differ
diff --git a/Skins/Deluxe/W&C.ini b/Skins/Deluxe/W&C.ini
index d70d09cd..12e298f0 100644
--- a/Skins/Deluxe/W&C.ini
+++ b/Skins/Deluxe/W&C.ini
@@ -15,39 +15,54 @@ GrayRight=Right Gray.bmp
 NoteBGLeft=Note BG Left.bmp
 NoteBGMid=Note BG Mid.bmp
 NoteBGRight=Note BG Right.bmp
-NoteStar=Note Star.jpg
-NotePerfectStar=NotePerfectStar.jpg
+
 Ball=Ball.bmp
 SongCover=Song Cover.jpg
 
 Button=Button.jpg
 
-LoadingBG=LoadingBackground.jpg
-MainBG=MainBG_W&C.jpg
-SongBG=W&C.jpg
-ScoreScreenBG=W&C.jpg
-Top5BG=W&C.jpg
-OptionsBG=W&C.jpg
-PartyBG=W&C.jpg
+LoadingBG      = [bg-load]summer.jpg
+MainBG         = [bg-main]summer.jpg
+SongBG         = [bg-main]summer.jpg
+ScoreScreenBG  = [bg-main]summer.jpg
+Top5BG         = [bg-main]summer.jpg
+OptionsBG      = [bg-main]summer.jpg
+PartyBG        = [bg-main]summer.jpg
+
+SongCD         = [icon]cd.jpg
+MainIcon       = [icon]main.jpg
+MainSearch     = [icon]search.jpg
+IconOption     = [icon]options.jpg
+IconSongMenu   = [icon]songmenu.jpg
+ScoreIcon      = [icon]score.jpg
+
+Leiste1        = [special]bar1.jpg
+Leiste2        = [special]bar2.jpg
+
+SongSelection1 = [main]songSelection1.jpg
+SongSelection2 = [main]songSelection2.jpg
+
+PlayerNumberBox = [main]playerNumberBox.jpg
+
+ScoreLine       = [main]scoreLine.jpg
+ScoreEndCap = [score]endcap.jpg
 
-SongCD       = [icon]cd.jpg
-MainIcon     = [icon]main.jpg
-MainSearch   = [icon]search.jpg
-IconOption   = [icon]options.jpg
-IconSongMenu = [icon]songmenu.jpg
 
-Leiste1=Leiste1.jpg
-Leiste2=Leiste2.jpg
+
+NoteStar        = [effect]goldenNoteStar.jpg
+NotePerfectStar = [effect]perfectNoteStar.jpg
+
 
 MainBar=Main Bar.jpg
 Logo=Main Bar2.jpg
 
-SongSelection1=Song Selection1.jpg
-SongSelection2=Song Selection2.jpg
+
+
+
 Bar=Bar.jpg
 ButtonF=Buttonf.jpg
 P=P.jpg
-ScoreLine=Score Line.jpg
+
 ScoreBox=Score Box.jpg
 ScoreLevel=Score Level.jpg
 ScoreLevelRound=Score Level Round.jpg
@@ -64,12 +79,12 @@ LineBonusBack=Line Bonus PopUp.jpg
 
 HDL_Pointer=Pointer.BMP
 
-ButtonP=button_p.jpg
-ButtonM=button_m.jpg
-ButtonJ=button_j.jpg
-ButtonAlt=button_alt.jpg
-ButtonAZ=button_az.jpg
-JumpToBG=Jump_to_background.jpg
-SongMenuBG=SongMenuBG.jpg
+ButtonP    = button_p.jpg
+ButtonM    = button_m.jpg
+ButtonJ    = button_j.jpg
+ButtonAlt  = button_alt.jpg
+ButtonAZ   = button_az.jpg
+JumpToBG   = [menu]jumpToBg.jpg
+SongMenuBG = [menu]songMenuBg.jpg
 
 Rectangle=Rectangle.jpg
\ No newline at end of file
diff --git a/Skins/Deluxe/W&C.jpg b/Skins/Deluxe/W&C.jpg
deleted file mode 100644
index 79f72163..00000000
Binary files a/Skins/Deluxe/W&C.jpg and /dev/null differ
diff --git a/Skins/Deluxe/[bg-load]summer.jpg b/Skins/Deluxe/[bg-load]summer.jpg
new file mode 100644
index 00000000..2786171a
Binary files /dev/null and b/Skins/Deluxe/[bg-load]summer.jpg differ
diff --git a/Skins/Deluxe/[bg-main]summer.jpg b/Skins/Deluxe/[bg-main]summer.jpg
new file mode 100644
index 00000000..d2d8326e
Binary files /dev/null and b/Skins/Deluxe/[bg-main]summer.jpg differ
diff --git a/Skins/Deluxe/[effect]goldenNoteStar.jpg b/Skins/Deluxe/[effect]goldenNoteStar.jpg
new file mode 100644
index 00000000..1ef6243d
Binary files /dev/null and b/Skins/Deluxe/[effect]goldenNoteStar.jpg differ
diff --git a/Skins/Deluxe/[effect]perfectNoteStar.jpg b/Skins/Deluxe/[effect]perfectNoteStar.jpg
new file mode 100644
index 00000000..189a22a3
Binary files /dev/null and b/Skins/Deluxe/[effect]perfectNoteStar.jpg differ
diff --git a/Skins/Deluxe/[icon]score.jpg b/Skins/Deluxe/[icon]score.jpg
new file mode 100644
index 00000000..6402fa9a
Binary files /dev/null and b/Skins/Deluxe/[icon]score.jpg differ
diff --git a/Skins/Deluxe/[main]playerNumberBox.jpg b/Skins/Deluxe/[main]playerNumberBox.jpg
new file mode 100644
index 00000000..53e7964c
Binary files /dev/null and b/Skins/Deluxe/[main]playerNumberBox.jpg differ
diff --git a/Skins/Deluxe/[main]scoreLine.jpg b/Skins/Deluxe/[main]scoreLine.jpg
new file mode 100644
index 00000000..546a87c7
Binary files /dev/null and b/Skins/Deluxe/[main]scoreLine.jpg differ
diff --git a/Skins/Deluxe/[main]songSelection1.jpg b/Skins/Deluxe/[main]songSelection1.jpg
new file mode 100644
index 00000000..e12296be
Binary files /dev/null and b/Skins/Deluxe/[main]songSelection1.jpg differ
diff --git a/Skins/Deluxe/[main]songSelection2.jpg b/Skins/Deluxe/[main]songSelection2.jpg
new file mode 100644
index 00000000..cb3a3396
Binary files /dev/null and b/Skins/Deluxe/[main]songSelection2.jpg differ
diff --git a/Skins/Deluxe/[menu]jumpToBg.jpg b/Skins/Deluxe/[menu]jumpToBg.jpg
new file mode 100644
index 00000000..a8b93e10
Binary files /dev/null and b/Skins/Deluxe/[menu]jumpToBg.jpg differ
diff --git a/Skins/Deluxe/[menu]songMenuBg.jpg b/Skins/Deluxe/[menu]songMenuBg.jpg
new file mode 100644
index 00000000..ef530ef5
Binary files /dev/null and b/Skins/Deluxe/[menu]songMenuBg.jpg differ
diff --git a/Skins/Deluxe/[score]endcap.jpg b/Skins/Deluxe/[score]endcap.jpg
new file mode 100644
index 00000000..0cad98a5
Binary files /dev/null and b/Skins/Deluxe/[score]endcap.jpg differ
diff --git a/Skins/Deluxe/[special]bar1.jpg b/Skins/Deluxe/[special]bar1.jpg
new file mode 100644
index 00000000..e73fdb54
Binary files /dev/null and b/Skins/Deluxe/[special]bar1.jpg differ
diff --git a/Skins/Deluxe/[special]bar2.jpg b/Skins/Deluxe/[special]bar2.jpg
new file mode 100644
index 00000000..9268a3d1
Binary files /dev/null and b/Skins/Deluxe/[special]bar2.jpg differ
diff --git a/Skins/Deluxe/jump_to_background.jpg b/Skins/Deluxe/jump_to_background.jpg
deleted file mode 100644
index a8b93e10..00000000
Binary files a/Skins/Deluxe/jump_to_background.jpg and /dev/null differ
diff --git a/Skins/Deluxe/leiste1.jpg b/Skins/Deluxe/leiste1.jpg
deleted file mode 100644
index e73fdb54..00000000
Binary files a/Skins/Deluxe/leiste1.jpg and /dev/null differ
diff --git a/Skins/Deluxe/leiste2.jpg b/Skins/Deluxe/leiste2.jpg
deleted file mode 100644
index 9268a3d1..00000000
Binary files a/Skins/Deluxe/leiste2.jpg and /dev/null differ
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 5ef17969..06f31713 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -27,7 +27,6 @@ GrayLight = 191 191 191
 Gray = 127 127 127
 GrayDark = 63 63 63
 Black = 0 0 0
-AquaLightGreen = 0 180 140
 
 [Loading]
 Texts =2
@@ -39,8 +38,8 @@ Tex=LoadingBG
 [LoadingText1]
 X =30
 Y =550
-Color =White
-Font =1
+Color =Black
+Font =0
 Align =0
 Size =10
 Text =SING_LOADING
@@ -48,7 +47,7 @@ Text =SING_LOADING
 [LoadingText2]
 X =590
 Y =556
-Color=White
+Color=Black
 Font =0
 Size =6
 Align=0
@@ -82,12 +81,13 @@ Text=
 [MainStatic1]
 X =0
 Y =549
-W =255
+W =252
 H =28
 Tex=Leiste1
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [MainStatic2]
 X =254
@@ -98,6 +98,7 @@ Tex=Leiste2
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [MainStatic3]
 X =600
@@ -107,8 +108,7 @@ H =22
 Tex=ButtonM
 Color =White
 Type=Plain
-Reflection=1
-
+Style=5
 
 [MainText2]
 X =625
@@ -280,12 +280,13 @@ Type=Font Black
 [SongStatic3]
 X =0
 Y =549
-W =255
+W =252
 H =28
 Tex=Leiste1
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [SongStatic4]
 X =254
@@ -296,9 +297,9 @@ Tex=Leiste2
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [SongStatic8]
-#X =295
 X =260
 Y =553
 W =26
@@ -306,7 +307,6 @@ H =22
 Tex=ButtonAlt
 Color =White
 Type=Plain
-Reflection=1
 
 [SongText5]
 X =288
@@ -325,7 +325,6 @@ H =22
 Tex=ButtonAZ
 Color =White
 Type=Plain
-Reflection=1
 
 [SongText6]
 X =330
@@ -344,7 +343,6 @@ H =22
 Tex=ButtonM
 Color =White
 Type=Plain
-Reflection=1
 
 [SongText3]
 X =450
@@ -363,7 +361,6 @@ H =22
 Tex=ButtonJ
 Color =White
 Type=Plain
-Reflection=1
 
 [SongText4]
 X =540
@@ -382,7 +379,6 @@ H =22
 Tex=ButtonP
 Color =White
 Type=Plain
-Reflection=1
 
 [SongText7]
 X =705
@@ -861,40 +857,31 @@ Texts =1
 Tex=ScoreScreenBG
 
 [ScoreText1]
-X =90
-Y =500
-Color =GrayDark
-Font =1
-Size =17
-Text =song score
-Align=0
-
-[ScoreTextArtist]
-X =450
-Y =500
-Color=GrayDark
+X =70
+Y =6
+Color=White
 Font =0
-Size =9
-Text =Artist
+Size =20
+Text=song score
 Align=0
 
-[ScoreTextTitle]
-X =450
-Y =525
+[ScoreTextArtistTitle]
+X =70
+Y =53
+Color=White
 Font =0
-Size =9
-Text =Title
-Align=0
-Color=Gray
+Size =10
+Align =0
+Text=ArtistTitle
 
-[ScoreTextName1]
-X =200
-Y =160
-Font =1
-Size =12
-Text =P1
-Color =P1Dark
-Align=0
+[ScoreStatic1]
+X =40
+Y =22
+W =27
+H =27
+Color =White
+Tex =ScoreIcon
+Type=Font Black
 
 [ScoreTextName2]
 X =50
@@ -914,14 +901,7 @@ Text =P2
 Color =P2Dark
 Align=0
 
-[ScoreTextScore1]
-X =250
-Y =110
-Color=GrayDark
-Font =1
-Size =9
-Text =Tone Deaf
-Align=0
+
 
 [ScoreTextScore2]
 X =100
@@ -941,14 +921,7 @@ Size =9
 Text =Tone Deaf
 Align=0
 
-[ScoreTextNotes1]
-X =235
-Y =220
-Color=GrayDark
-Font =0
-Size =9
-Text=SING_NOTES
-Align=0
+
 
 [ScoreTextNotes2]
 X =85
@@ -968,14 +941,7 @@ Size =9
 Text =SING_NOTES
 Align=0
 
-[ScoreTextNotesScore1]
-X =440
-Y =220
-Color=GrayDark
-Font =1
-Size =10
-Align =2
-Text =0000
+
 
 [ScoreTextNotesScore2]
 X =290
@@ -995,14 +961,7 @@ Size =10
 Align =2
 Text =0000
 
-[ScoreTextLineBonus1]
-X =235
-Y =260
-Color=GrayDark
-Font =0
-Size =9
-Text =SING_PHRASE_BONUS
-Align=0
+
 
 [ScoreTextLineBonus2]
 X =85
@@ -1022,14 +981,7 @@ Size =9
 Text =SING_PHRASE_BONUS
 Align=0
 
-[ScoreTextLineBonusScore1]
-X =440
-Y =260
-Color=GrayDark
-Font =1
-Size =10
-Align =2
-Text =0000
+
 
 [ScoreTextLineBonusScore2]
 X =290
@@ -1049,14 +1001,6 @@ Size =10
 Align =2
 Text =0000
 
-[ScoreTextGoldenNotes1]
-X =235
-Y =300
-Color=GrayDark
-Font =0
-Size =9
-Text =SING_GOLDEN_NOTES
-Align=0
 
 [ScoreTextGoldenNotes2]
 X =85
@@ -1076,14 +1020,6 @@ Size =9
 Text =SING_GOLDEN_NOTES
 Align=0
 
-[ScoreTextGoldenNotesScore1]
-X =440
-Y =300
-Color=GrayDark
-Font =1
-Size =10
-Align =2
-Text =0000
 
 [ScoreTextGoldenNotesScore2]
 X =290
@@ -1103,15 +1039,6 @@ Size =10
 Align =2
 Text =0000
 
-[ScoreTextTotal1]
-X =200
-Y =370
-Color=GrayDark
-Font =0
-Size =9
-Text=SING_TOTAL
-Align=0
-
 [ScoreTextTotal2]
 X =50
 Y =370
@@ -1125,20 +1052,11 @@ Align=0
 X =510
 Y =370
 Color=GrayDark
-Font =0
+Font =1
 Size =9
 Text =SING_TOTAL
 Align=0
 
-[ScoreTextTotalSCore1]
-X =440
-Y =360
-Color=GrayDark
-Font =1
-Size =15
-Align =2
-Text =00000
-
 [ScoreTextTotalSCore2]
 X =290
 Y =360
@@ -1157,22 +1075,22 @@ Size =15
 Align =2
 Text =00000
 
-[ScorePlayer1Static1]
+[ScorePlayer2Static1]
 Tex =ScoreLine
-X =200
+X =50
 Y =205
 W =240
 H =6
-Color =GrayDark
 Type =Font Black
+Color =GrayDark
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer1Static2]
+[ScorePlayer2Static2]
 Tex =ScoreLine
-X =200
+X =50
 Y =345
 W =240
 H =6
@@ -1183,9 +1101,9 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer1Static3]
+[ScorePlayer2Static3]
 Tex =ScoreLine
-X =200
+X =50
 Y =410
 W =240
 H =6
@@ -1196,35 +1114,37 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLightest1]
+[ScoreStaticBoxLightest2]
 Tex =ScoreBox
-X =200
+X =50
 Y =220
 W =30
 H =30
-Color =P1Lightest
+Color = DarkPurple
+#P1Lightest
 Type=
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLight1]
+[ScoreStaticBoxLight2]
 Tex =ScoreBox
-X =200
+X =50
 Y =260
 W =30
 H =30
-Color =P1Light
+Color =DarkGreen
+#P1Light
 Type=
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxDark1]
+[ScoreStaticBoxDark2]
 Tex =ScoreBox
-X =200
+X =50
 Y =300
 W =30
 H =30
@@ -1235,9 +1155,9 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer2Static1]
+[ScorePlayer3Static1]
 Tex =ScoreLine
-X =50
+X =510
 Y =205
 W =240
 H =6
@@ -1248,9 +1168,9 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer2Static2]
+[ScorePlayer3Static2]
 Tex =ScoreLine
-X =50
+X =510
 Y =345
 W =240
 H =6
@@ -1261,9 +1181,9 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer2Static3]
+[ScorePlayer3Static3]
 Tex =ScoreLine
-X =50
+X =510
 Y =410
 W =240
 H =6
@@ -1274,128 +1194,235 @@ TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLightest2]
+[ScoreStaticBoxLightest3]
 Tex =ScoreBox
-X =50
+X =510
 Y =220
 W =30
 H =30
-Color =P1Lightest
+Color =P2Lightest
 Type=
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLight2]
+[ScoreStaticBoxLight3]
 Tex =ScoreBox
-X =50
+X =510
 Y =260
 W =30
 H =30
-Color =P1Light
+Color =P2Light
 Type=
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxDark2]
+[ScoreStaticBoxDark3]
 Tex =ScoreBox
-X =50
+X =510
 Y =300
 W =30
 H =30
-Color =P1Dark
+Color =P2Dark
 Type=
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer3Static1]
+# # # # # # # # # # # # # # # # # # One Player Score # # # # # # # # # # # #
+[ScoreTextName1]
+X =150
+Y =260
+Font =0
+Size =14
+Text =P1
+Color =White
+Align=0
+
+[ScoreTextScore1]
+X =150
+Y =430
+Color=White
+Font =1
+Size =9
+Text =Tone Deaf
+Align=0
+
+[ScoreTextNotes1]
+X =150
+Y =340
+Color=White
+Font =0
+Size =9
+Text=SING_NOTES
+Align=0
+
+[ScoreTextNotesScore1]
+X =440
+Y =340
+Color=White
+Font =0
+Size =10
+Align =2
+Text =0
+
+[ScoreTextLineBonus1]
+X =150
+Y =370
+Color=White
+Font =0
+Size =9
+Text =SING_PHRASE_BONUS
+Align=0
+
+[ScoreTextLineBonusScore1]
+X =440
+Y =370
+Color=White
+Font =0
+Size =10
+Align =2
+Text =0
+
+[ScoreTextGoldenNotes1]
+X =150
+Y =400
+Color=White
+Font =0
+Size =9
+Text =SING_GOLDEN_NOTES
+Align=0
+
+[ScoreTextGoldenNotesScore1]
+X =440
+Y =400
+Color=White
+Font =0
+Size =10
+Align =2
+Text =0
+
+[ScoreTextTotal1]
+X =180
+Y =460
+Color=White
+Font =0
+Size =14
+Text=SING_TOTAL
+Align=0
+
+[ScoreTextTotalSCore1]
+X =440
+Y =460
+Color=White
+Font =0
+Size =14
+Align =2
+Text =0
+
+[ScorePlayer1Static1]
 Tex =ScoreLine
-X =510
-Y =205
-W =240
-H =6
+X =148
+Y =338
+W =295
+H =2
+Color =White
 Type =Font Black
-Color =GrayDark
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer3Static2]
+[ScorePlayer1Static2]
 Tex =ScoreLine
-X =510
-Y =345
-W =240
-H =6
+X =148
+Y =368
+W =295
+H =2
+Color =White
 Type =Font Black
-Color =GrayDark
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScorePlayer3Static3]
+[ScorePlayer1Static3]
 Tex =ScoreLine
-X =510
-Y =410
-W =240
-H =6
+X =148
+Y =398
+W =295
+H =2
+Color =White
 Type =Font Black
-Color =GrayDark
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLightest3]
-Tex =ScoreBox
-X =510
-Y =220
-W =30
-H =30
-Color =P2Lightest
-Type=
+[ScorePlayer1Static4]
+Tex =ScoreLine
+X =148
+Y =428
+W =295
+H =2
+Color =White
+Type =Font Black
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxLight3]
-Tex =ScoreBox
-X =510
-Y =260
-W =30
-H =30
-Color =P2Light
-Type=
+[ScorePlayer1Static5]
+Tex =ScoreLine
+X =148
+Y =458
+W =295
+H =4
+Type =Font Black
+Color =White
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
 
-[ScoreStaticBoxDark3]
-Tex =ScoreBox
-X =510
-Y =300
-W =30
-H =30
-Color =P2Dark
-Type=
+[ScorePlayer1Static6]
+Tex =PlayerNumberBox
+X =150
+Y =467
+W =25
+H =25
+Type =Font Black
+Color =P1Dark
 TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
+Z=0.9
+Reflection=1
+ReflectionSpacing=1
+
+[ScorePlayer1Text1]
+X =154
+Y =472
+W =30
+H =30
+Z=1
+Color=White
+Font =1
+Size =5
+Align=0
+Text=P1
 
+# S C O R E   B A R S
 [ScoreStaticBackLevel1]
 Tex =ScoreLevel
-X =460
-Y =140
-W =120
+X =450
+Y =160
+W =150
 H =300
 Color =P1Lightest
 Type =Font Black
@@ -1406,9 +1433,9 @@ TexY2=0.9
 
 [ScoreStaticBackLevelRound1]
 Tex =ScoreLevelRound
-X =460
-Y =110
-W =120
+X =450
+Y =130
+W =150
 H =30
 Color =P1Lightest
 Type =Font Black
@@ -1419,9 +1446,9 @@ TexY2=0.5
 
 [ScoreStaticLevel1]
 Tex =ScoreLevel
-X =460
+X =450
 Y =410
-W =120
+W =150
 H =30
 Color =P1Light
 Type =Font Black
@@ -1430,11 +1457,11 @@ TexY1=0.1
 TexX2=1
 TexY2=0.9
 
-[ScoreStaticLevelRound1]
+[ScoreStaticLevelRound1] 
 Tex =ScoreLevelRound
-X =460
+X =450
 Y =380
-W =120
+W =150
 H =30
 Color =P1Light
 Type =Font Black
@@ -1443,6 +1470,37 @@ TexY1=0
 TexX2=1
 TexY2=0.5
 
+[ScorePlayer1Static7]
+Tex =ScoreEndCap
+X =469
+Y =460
+W =112
+H =30
+Color =P1Dark
+Type =Font Black
+TexX1=0
+TexY1=0.1
+TexX2=1
+TexY2=0.9
+Reflection=1
+ReflectionSpacing=1
+
+[ScorePlayer1Static8]
+Tex =ScoreLine
+X =468
+Y =460
+W =114
+H =2
+Color =White
+Type =Font Black
+TexX1=0
+TexY1=0.1
+TexX2=1
+TexY2=0.9
+Z=1
+
+# # # # # # # # # # # # # # # # # # Two Player Score? # # # # # # # # # # # #
+
 [ScoreStaticBackLevel2]
 Tex =ScoreLevel
 X =290
@@ -1495,6 +1553,7 @@ TexY1=0
 TexX2=1
 TexY2=0.5
 
+# # # # # # # # # # # # # # # # # # Three Player Score? # # # # # # # # # # # #
 [ScoreStaticBackLevel3]
 Tex =ScoreLevel
 X =390
@@ -2195,12 +2254,13 @@ Type=Font Black
 [OptionsStatic2]
 X =0
 Y =549
-W =255
+W =252
 H =28
 Tex=Leiste1
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [OptionsStatic3]
 X =254
@@ -2211,6 +2271,7 @@ Tex=Leiste2
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [OptionsText2]
 X =120
@@ -3149,6 +3210,7 @@ Type = Font Black
 
 [OptionsAdvanced]
 Texts = 1
+Statics=1
 
 [OptionsAdvancedBackground]
 Tex=OptionsBG
@@ -3170,6 +3232,137 @@ H =27
 Color =White
 Tex =IconOption
 Type=Font Black
+Texts = 1
+
+[OptionsAdvancedSelectLoadAnimation]
+Tex =MainBar
+TexSBG =MainBar
+Text=SING_OPTIONS_ADVANCED_LOADANIMATION
+X = 40
+Y = 100
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedSelectEffectPerfect]
+Tex =MainBar
+TexSBG =MainBar
+Text =SING_OPTIONS_ADVANCED_EFFECTPERFECT
+X = 40
+Y = 170
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedSelectEffectGolden]
+Tex =MainBar
+TexSBG =MainBar
+Text =SING_OPTIONS_ADVANCED_EFFECTGOLDEN
+X = 40
+Y = 240
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedSelectLineBonus]
+Tex =MainBar
+TexSBG =MainBar
+Text =SING_OPTIONS_GRAPHICS_LINEBONUS
+X = 40
+Y = 310
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedSelectSlideOnSongClick]
+Tex =MainBar
+TexSBG =MainBar
+Text=SING_OPTIONS_ADVANCED_ONSONGCLICK
+X = 40
+Y = 380
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedSelectAskbeforeDel]
+Tex =MainBar
+TexSBG =MainBar
+Text =SING_OPTIONS_ADVANCED_ASKBEFOREDEL
+X = 40
+Y = 450
+W = 230
+H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedButtonExit]
+X = 40
+Y = 520
+W = 230
+H = 70
+Tex =MainBar
+Color = ColorDark
+DColor = Gray
+Type = Font Black
 
 [Top5]
 Texts=1
@@ -3447,12 +3640,13 @@ Text=SING_DIFFICULTY
 [LevelStatic1]
 X =0
 Y =549
-W =255
+W =252
 H =28
 Tex=Leiste1
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [LevelStatic2]
 X =254
@@ -3463,6 +3657,7 @@ Tex=Leiste2
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [LevelStatic3]
 X =40
@@ -3563,12 +3758,13 @@ Tex=MainBG
 [NameStatic1]
 X =0
 Y =549
-W =255
+W =252
 H =28
 Tex=Leiste1
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [NameStatic2]
 X =254
@@ -3579,6 +3775,7 @@ Tex=Leiste2
 Color =White
 Type=Plain
 Reflection=1
+ReflectionSpacing=1
 
 [NameText2]
 X =120
@@ -4271,14 +4468,13 @@ Texts = 1
 Tex=PartyBG
 
 [PartyOptionsText1]
-X = 30
-Y = 0
+X = 50
+Y = 10
 ColR = 0.7
 ColG = 0.7
 ColB = 0.7
 Font = 1
-Size = 20
-Color =White
+Size = 25
 Text=PARTY_OPTIONS_DESC
 
 [PartyOptionsSelectLevel]
@@ -4457,8 +4653,8 @@ Tex=PartyBG
 
 [PartyPlayerTeam1Name]
 Tex=Button
-X=10
-Y=100
+X=25
+Y=50
 W=250
 H=70
 Type=Font Black
@@ -4480,8 +4676,8 @@ Color=White
 
 [PartyPlayerPlayer1Name]
 Tex=Button
-X=10
-Y=190
+X=25
+Y=120
 W=250
 H=70
 Type=Font Black
@@ -4503,8 +4699,8 @@ Color=White
 
 [PartyPlayerPlayer2Name]
 Tex=Button
-X=10
-Y=270
+X=25
+Y=190
 W=250
 H=70
 Type=Font Black
@@ -4526,8 +4722,8 @@ Color=White
 
 [PartyPlayerPlayer3Name]
 Tex=Button
-X=10
-Y=350
+X=25
+Y=260
 W=250
 H=70
 Type=Font Black
@@ -4549,8 +4745,8 @@ Color=White
 
 [PartyPlayerPlayer4Name]
 Tex=Button
-X=10
-Y=430
+X=25
+Y=330
 W=250
 H=70
 Type=Font Black
@@ -4572,8 +4768,8 @@ Color=White
 
 [PartyPlayerTeam2Name]
 Tex=Button
-X=280
-Y=100
+X=300
+Y=50
 W=250
 H=70
 Type=Font Black
@@ -4595,8 +4791,8 @@ Color=White
 
 [PartyPlayerPlayer5Name]
 Tex=Button
-X=280
-Y=190
+X=300
+Y=120
 W=250
 H=70
 Type=Font Black
@@ -4618,8 +4814,8 @@ Color=White
 
 [PartyPlayerPlayer6Name]
 Tex=Button
-X=280
-Y=270
+X=300
+Y=190
 W=250
 H=70
 Type=Font Black
@@ -4641,8 +4837,8 @@ Color=White
 
 [PartyPlayerPlayer7Name]
 Tex=Button
-X=280
-Y=350
+X=300
+Y=260
 W=250
 H=70
 Type=Font Black
@@ -4664,8 +4860,8 @@ Color=White
 
 [PartyPlayerPlayer8Name]
 Tex=Button
-X=280
-Y=430
+X=300
+Y=330
 W=250
 H=70
 Type=Font Black
@@ -4687,8 +4883,8 @@ Color=White
 
 [PartyPlayerTeam3Name]
 Tex=Button
-X=550
-Y=100
+X=25
+Y=360
 W=250
 H=70
 Type=Font Black
@@ -4710,8 +4906,8 @@ Color=White
 
 [PartyPlayerPlayer9Name]
 Tex=Button
-X=550
-Y=190
+X=25
+Y=400
 W=250
 H=70
 Type=Font Black
@@ -4733,8 +4929,8 @@ Color=White
 
 [PartyPlayerPlayer10Name]
 Tex=Button
-X=550
-Y=270
+X=25
+Y=460
 W=250
 H=70
 Type=Font Black
@@ -4756,8 +4952,8 @@ Color=White
 
 [PartyPlayerPlayer11Name]
 Tex=Button
-X=550
-Y=350
+X=25
+Y=500
 W=250
 H=70
 Type=Font Black
@@ -4779,8 +4975,8 @@ Color=White
 
 [PartyPlayerPlayer12Name]
 Tex=Button
-X=550
-Y=430
+X=25
+Y=540
 W=250
 H=70
 Type=Font Black
@@ -4801,14 +4997,13 @@ Text=Player 12
 Color=White
 
 [PartyPlayerText1]
-X=10
-Y=5
+X=30
+Y=180
 Font=1
-Size=18
+Size=22
 Align=0
 Text=PARTY_SELECT_PLAYER
-Color=White
-
+Color=GrayLight
 
 [SongMenu]
 Texts=0
-- 
cgit v1.2.3