Some Themework in Classic. 5 Screens, help-keys and some fixes left.

Fix: Autum-BG renamed to Autumn in Deluxe.

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

9 files changed, 247 insertions, 54 deletions

diff --git a/Skins/Classic/[main]Button2.jpg b/Skins/Classic/[main]Button2.jpg
new file mode 100644
index 00000000..e3e9679a
--- /dev/null
+++ b/Skins/Classic/[main]Button2.jpg
diff --git a/Skins/Classic/[main]Button3.jpg b/Skins/Classic/[main]Button3.jpg
new file mode 100644
index 00000000..3ac1f442
--- /dev/null
+++ b/Skins/Classic/[main]Button3.jpg
diff --git a/Skins/Classic/[main]Logo.jpg b/Skins/Classic/[main]Logo.jpg
index d4d27533..1902cb02 100644
--- a/Skins/Classic/[main]Logo.jpg
+++ b/Skins/Classic/[main]Logo.jpg
diff --git a/Skins/Classic/[party]Joker.jpg b/Skins/Classic/[party]Joker.jpg
new file mode 100644
index 00000000..78b66936
--- /dev/null
+++ b/Skins/Classic/[party]Joker.jpg
diff --git a/Skins/Deluxe/Autum.ini b/Skins/Deluxe/Autumn.ini
index 33adc9d3..0e95f031 100644
--- a/Skins/Deluxe/Autum.ini
+++ b/Skins/Deluxe/Autumn.ini
@@ -5,7 +5,7 @@
 

 [Skin]

 Theme=Deluxe

-Name=Autum

+Name=Autumn

 Color=Orange

 

 [Textures]

@@ -18,13 +18,13 @@ MainBar        = [main]mainBar.jpg
 SelectBG       = [main]selectbg.jpg

 

 #Backgrounds

-LoadingBG      = [bg-load]autum.jpg

-MainBG         = [bg-main]autum.jpg

-SongBG         = [bg-main]autum.jpg

-ScoreScreenBG  = [bg-main]autum.jpg

-Top5BG         = [bg-main]autum.jpg

-OptionsBG      = [bg-main]autum.jpg

-PartyBG        = [bg-main]autum.jpg

+LoadingBG      = [bg-load]autumn.jpg

+MainBG         = [bg-main]autumn.jpg

+SongBG         = [bg-main]autumn.jpg

+ScoreScreenBG  = [bg-main]autumn.jpg

+Top5BG         = [bg-main]autumn.jpg

+OptionsBG      = [bg-main]autumn.jpg

+PartyBG        = [bg-main]autumn.jpg

 

 #Icons on screen

 SongCD         = [icon]cd.jpg

diff --git a/Skins/Deluxe/[bg-load]autum.jpg b/Skins/Deluxe/[bg-load]autumn.jpg
index 51ee048c..51ee048c 100644
--- a/Skins/Deluxe/[bg-load]autum.jpg
+++ b/Skins/Deluxe/[bg-load]autumn.jpg
diff --git a/Skins/Deluxe/[bg-main]autum.jpg b/Skins/Deluxe/[bg-main]autumn.jpg
index ae29b9bd..ae29b9bd 100644
--- a/Skins/Deluxe/[bg-main]autum.jpg
+++ b/Skins/Deluxe/[bg-main]autumn.jpg
diff --git a/Themes/Classic.ini b/Themes/Classic.ini
index a437377e..757d7c03 100644
--- a/Themes/Classic.ini
+++ b/Themes/Classic.ini
@@ -32,12 +32,12 @@ Size =14
 Text =SING_LOADING

 

 [LoadingText2]

-X =628

+X =790

 Y =583

 Color=Grey

 Font =0

 Size =6

-Align=0

+Align=2

 Text=US_VERSION

 

 [Main]

@@ -104,9 +104,9 @@ Text=
 [MainStatic1]

 Tex =Logo

 X =30

-Y =320

+Y =300

 W =740

-H =275

+H =283

 Color =ColorDark

 Type=Font Black

 TexX1=0

@@ -130,7 +130,7 @@ TexY2=1
 [MainStatic3]

 Tex =ButtonNavi

 X =190

-Y =570

+Y =574

 W =30

 H =22

 Color =White

@@ -143,7 +143,7 @@ TexY2=1
 [MainStatic4]

 Tex =ButtonEnter

 X =350

-Y =571

+Y =574

 W =26

 H =22

 Color =White

@@ -156,7 +156,7 @@ TexY2=1
 [MainStatic5]

 Tex =ButtonE

 X =510

-Y =570

+Y =574

 W =22

 H =22

 Color =White

@@ -295,7 +295,7 @@ Align=0
 [SongText2]

 X =50

 Y =500

-Color=Black

+Color=GrayDark

 Font =1

 Size =8

 Text=SING_SONG_SELECTION_DESC

@@ -305,7 +305,7 @@ Align=0
 X =0

 Y =100

 W =800

-H =350

+H =450

 Color=Black

 Tex =SongFade

 Type=Font Black

@@ -403,6 +403,203 @@ Text=
 #TexX2=1

 #TexY2=1

 

+# Jokers, 5 for each team, only shown in party Mode

+[SongStaticTeam1Joker1]

+Tex =Joker

+X =20

+Y =30

+W =50

+H =50

+Color=P1Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam1Joker2]

+Tex =Joker

+X =70

+Y =30

+W =50

+H =50

+Color=P1Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam1Joker3]

+Tex =Joker

+X =120

+Y =30

+W =50

+H =50

+Color=P1Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam1Joker4]

+Tex =Joker

+X =170

+Y =30

+W =50

+H =50

+Color=P1Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam1Joker5]

+Tex =Joker

+X =220

+Y =30

+W =50

+H =50

+Color=P1Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam2Joker1]

+Tex =Joker

+X =280

+Y =30

+W =50

+H =50

+Color=P2Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam2Joker2]

+Tex =Joker

+X =330

+Y =30

+W =50

+H =50

+Color=P2Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam2Joker3]

+Tex =Joker

+X =380

+Y =30

+W =50

+H =50

+Color=P2Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam2Joker4]

+Tex =Joker

+X =430

+Y =30

+W =50

+H =50

+Color=P2Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam2Joker5]

+Tex =Joker

+X =480

+Y =30

+W =50

+H =50

+Color=P2Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam3Joker1]

+Tex =Joker

+X =540

+Y =30

+W =50

+H =50

+Color=P3Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam3Joker2]

+Tex =Joker

+X =590

+Y =30

+W =50

+H =50

+Color=P3Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam3Joker3]

+Tex =Joker

+X =640

+Y =30

+W =50

+H =50

+Color=P3Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam3Joker4]

+Tex =Joker

+X =690

+Y =30

+W =50

+H =50

+Color=P3Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+[SongStaticTeam3Joker5]

+Tex =Joker

+X =740

+Y =30

+W =50

+H =50

+Color=P3Dark

+Type=Font Black

+TexX1=0

+TexY1=0

+TexX2=1

+TexY2=1

+

+

 [Sing]

 Texts =1

 

@@ -412,7 +609,7 @@ X =43
 Y =17

 Font =1

 Size =6

-Color =White

+Color =Black

 Align=1

 

 [SingStatic1]

@@ -424,10 +621,6 @@ W =780
 H =105

 Color =GrayLightest

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

 [SingStatic2]

 ;Time BG

@@ -438,12 +631,32 @@ W =328
 H =42

 Color =GrayLightest

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

 [SingStatic3]

+Tex =Rectangle

+X =140

+Y =21

+W =190

+H =10

+Color=Gray

+

+[SingTimeProgress]

+X =140

+Y =21

+W =190

+H =10

+Color=GrayDark

+

+[SingTimeText]

+Text =SING_TIME

+X =100

+Y =14

+Font =1

+Size =8

+Color =White

+Align=1

+

+[SingStatic4]

 Tex =Bar

 X =20

 Y =10

@@ -451,10 +664,6 @@ W =46
 H =30

 Color =Black

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

 [SingP1Static]

 Tex =P

@@ -464,10 +673,6 @@ W =45
 H =50

 Color =P1Dark

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

 [SingP1Static2]

 Tex =ScoreBG

@@ -1993,9 +2198,7 @@ Tex=OptionsBG
 [OptionsText1]

 X = 50

 Y = 170

-ColR = 0.7

-ColG = 0.7

-ColB = 0.7

+Color=GrayLight

 Font = 1

 Size = 25

 Text = SING_OPTIONS

@@ -2003,9 +2206,7 @@ Text = SING_OPTIONS
 [OptionsText2]

 X = 250

 Y = 550

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

+Color=Gray

 Font = 1

 Size = 8

 Text=SING_LEGEND_NAVIGATE

@@ -2013,9 +2214,7 @@ Text=SING_LEGEND_NAVIGATE
 [OptionsText3]

 X = 500

 Y = 550

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

+Color=Gray

 Font = 1

 Size = 8

 Text=SING_LEGEND_SELECT

@@ -2028,17 +2227,11 @@ W=32
 H=32

 Color=ColorDark

 Type=Font Black

-TexX1=0

-TexY1=0

-TexX2=1

-TexY2=1

 

 [OptionsTextDescription]

 X = 70

 Y = 248

-ColR = 0.5

-ColG = 0.5

-ColB = 0.5

+Color=GrayDark

 Font = 1

 Size = 10

 

@@ -3696,7 +3889,7 @@ Font=1
 Size=10

 Align=0

 Text=SING_DIFFICULTY_DESC

-Color=Gray

+Color=GrayDark

 

 [LevelButtonEasyText1]

 X=115

@@ -3761,7 +3954,7 @@ Font=1
 Size=10

 Align=0

 Text=SING_PLAYER_DESC

-Color=Gray

+Color=GrayDark

 

 [NameButtonPlayer1]

 Tex=Button

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 4a603b67..80f09e1e 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -49,12 +49,12 @@ Size =10
 Text =SING_LOADING

 

 [LoadingText2]

-X =590

+X =790

 Y =556

 Color=Black

 Font =0

 Size =6

-Align=0

+Align=2

 Text=US_VERSION

 

 [Main]