medley mod: Themes modifications. This is considered the last part of the medley mod.

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

6 files changed, 143 insertions, 81 deletions

diff --git a/game/themes/Candy.ini b/game/themes/Candy.ini
index 8bd894a4..09f929fd 100755
--- a/game/themes/Candy.ini
+++ b/game/themes/Candy.ini
@@ -302,7 +302,7 @@ Y = 123
 W = 325

 H = 200

 Reflections = 1

-Style=5

+Style = 5

 

 [SongEqualizer]

 Visible = 1

@@ -327,6 +327,26 @@ Color = Button
 Tex = icon_song_video

 Type = Transparent

 

+[SongMedleyIcon]

+X = 493

+Y = 510

+W = 10

+H = 10

+Z = 0.99

+Color = Button

+Tex = icon_song_medley

+Type = Transparent

+

+[SongCalculatedMedleyIcon]

+X = 493

+Y = 510

+W = 10

+H = 10

+Z = 0.99

+Color = Button

+Tex = icon_song_calcmedley

+Type = Transparent

+

 [SongTextArtist]

 X = 400

 Y = 338

@@ -471,7 +491,6 @@ Align = 2
 Text = SING_SONG_SELECTION_PLAYLIST

 

 

-

 #and these are the ones for partymode

 [SongStaticParty1]

 X = 759

@@ -759,9 +778,9 @@ Statics = 8
 

 [SingBackground]

 Type=color

-ColR=1

-ColB=1

-ColG=1

+ColR = 1

+ColB = 1

+ColG = 1

 

 [SingText1]

 Text = SING_TIME

@@ -2203,6 +2222,24 @@ Tex = ScoreLine
 Type = Transparent

 Color = Light

 

+[ScoreStaticNavigate]

+X = 759

+Y = 65

+W = 22

+H = 22

+Tex = ButtonNavi

+Color = White

+Type = Transparent

+

+[ScoreTextNavigate]

+X = 753

+Y = 64

+Color = Light

+Font = 0

+Size = 24

+Align = 2

+Text = SING_LEGEND_NAVIGATE

+

 #================================================================== Options ======

 

 [Options]

@@ -2485,7 +2522,6 @@ Text = SING_OPTIONS_EXIT
 Color = Button

 

 

-

 [OptionsGame]

 Texts = 5

 

@@ -3974,7 +4010,6 @@ Size = 42
 Align = 2

 Text = 00000

 

-

 [Top5TextDate1]

 X = 760

 Y = 190

@@ -4168,8 +4203,8 @@ Font = 0
 Size = 24

 Align = 0

 Text = SING_EDIT_SELECT

-Reflection=1

-ReflectionSpacing=13

+Reflection = 1

+ReflectionSpacing = 13

 

 # Esc button text

 [EditText5]

@@ -4180,8 +4215,8 @@ Font = 0
 Size = 24

 Align = 0

 Text = SING_EDIT_EXIT

-Reflection=1

-ReflectionSpacing=13

+Reflection = 1

+ReflectionSpacing = 13

 

 [EditTextDescription]

 X = 95

@@ -5167,7 +5202,6 @@ Size = 30
 Text = Player 3

 Align = 1

 

-

 [PartyScore]

 [PartyScoreBackground]

 Tex = MainBG

@@ -6090,7 +6124,6 @@ Text = Player 12
 Color = White

 

 

-

 [PartyRoundsBackground]

 Tex = OptionsBG

 

@@ -6338,11 +6371,11 @@ STDColor = White
 [SongMenu]

 

 [SongMenuBackground]

-Type=Fade

-ColR=255

-ColG=255

-ColB=255

-Alpha=0.6

+Type = Fade

+ColR = 255

+ColG = 255

+ColB = 255

+Alpha = 0.6

 

 [SongMenuStatic1]

 X = 518

@@ -6472,11 +6505,11 @@ Z = 0.97
 

 [SongJumpto]

 [SongJumptoBackground]

-Type=Fade

-ColR=255

-ColG=255

-ColB=255

-Alpha=0.6

+Type = Fade

+ColR = 255

+ColG = 255

+ColB = 255

+Alpha = 0.6

 

 [SongJumptoStatic1]

 X = 518

@@ -6971,11 +7004,11 @@ Text = SING_LEGEND_ESC
 [CheckPopup]

 

 [CheckPopupBackground]

-Type=Fade

-ColR=255

-ColG=255

-ColB=255

-Alpha=0.6

+Type = Fade

+ColR = 255

+ColG = 255

+ColB = 255

+Alpha = 0.6

 

 [CheckPopupStatic1]

 X = 280

@@ -7052,14 +7085,13 @@ Text = NO
 Align = 1

 Z = 1

 

-

 [ErrorPopup]

 [ErrorPopupBackground]

-Type=Fade

-ColR=255

-ColG=255

-ColB=255

-Alpha=0.6

+Type = Fade

+ColR = 255

+ColG = 255

+ColB = 255

+Alpha = 0.6

 

 [ErrorPopupStatic1]

 X = 280

@@ -7136,4 +7168,22 @@ IndicatorYOffset = 3
 X = 20

 W = 760

 Y = 532

-H = 41
\ No newline at end of file
+H = 41

+

+[SingSongNameStatic]

+Tex = SongName

+X = 10

+Y = 10

+W = 780

+H = 29

+Color = White

+Type = Transparent

+

+[SingSongNameText]

+Text = SongNameText

+X = 400

+Y = 13

+Font = 0

+Size = 25

+Color = Black

+Align = 1

diff --git a/game/themes/Candy/Clouds static.ini b/game/themes/Candy/Clouds static.ini
index 7d48ff6b..d81dbfd9 100755
--- a/game/themes/Candy/Clouds static.ini
+++ b/game/themes/Candy/Clouds static.ini
@@ -1,21 +1,24 @@
 [Skin]

-Theme=Candy

-Name=Clouds [static]

+Theme = Candy

+Name  = Clouds [static]

+

 [Textures]

 Cursor = [interface]cursor.png

 Cursor_Pressed = [interface]cursor_pressed.png

 

 iconlogo = [icon]logo.png

 

-icon_song_video = [icon]song_video.png

+icon_song_video      = [icon]song_video.png

+icon_song_medley     = [icon]song_medley.png

+icon_song_calcmedley = [icon]song_calcmedley.png

 

 ButtonMain      = [button]main.png

 Transparent     = Transparent.png

 MainBar         = [main]mainBar.png

 

-SelectBG       = [main]selectbg.png

+SelectBG        = [main]selectbg.png

 

-Select_ArrowLeft = [interface]select_arrow_left.png

+Select_ArrowLeft  = [interface]select_arrow_left.png

 Select_ArrowRight = [interface]select_arrow_right.png

 

 LoadingBG      = [bg-load]clouds.jpg

@@ -26,13 +29,13 @@ SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png

 SongCover      = [main]songCover.jpg

 PartyMenuBG    = [main]partymenubg.png

-SearchBG    = [main]searchbg.png

+SearchBG       = [main]searchbg.png

 

 LyricBar       = [sing]textBar.png

 

 LyricHelpBar   = [sing]lyricsHelpBar.png

 

-TimeBar      = [sing]timeBar.jpg

+TimeBar        = [sing]timeBar.jpg

 

 LineBonusBack  = [sing]scoreBg.png

 

@@ -46,6 +49,9 @@ P              = [sing]p.png
 

 Ball           = [sing]lyricsHelpBar.png

 

+#Song name for medley mode

+SongName       = [sing]SongName.png

+

 ScoreBox        = [score]box.png

 Scorepipe       = [score]pipe.png 

 ScoreLevel      = [score]level.png

@@ -84,22 +90,22 @@ Rating_5 = [score]rating_2.png
 Rating_6 = [score]rating_2.png

 Rating_7 = [score]rating_3.png

 

-Joker             =[party]Joker.png

-PartyPlayerButton =[party]playerButton.png

-PartyTeamButton1  =[party]roundTeamButton.png

-PartyTeamButton2  =[party]playerTeamButton.png

-PartyRoundBG1     =[party]roundBG1.png

-PartyRoundBG2     =[party]roundBG2.png

-PartyRoundBG3     =[party]roundBG3.png

-PartyRoundBG4     =[party]roundBG4.png

-HDL_Pointer       =[party]pointer.png

-PartyWinDeco1     =[party]winDecoration.png

-PartyWinDeco2     =[party]winDecoration.png

-PartyWinDeco3     =[party]winDecoration.png

+Joker               = [party]Joker.png

+PartyPlayerButton   = [party]playerButton.png

+PartyTeamButton1    = [party]roundTeamButton.png

+PartyTeamButton2    = [party]playerTeamButton.png

+PartyRoundBG1       = [party]roundBG1.png

+PartyRoundBG2       = [party]roundBG2.png

+PartyRoundBG3       = [party]roundBG3.png

+PartyRoundBG4       = [party]roundBG4.png

+HDL_Pointer         = [party]pointer.png

+PartyWinDeco1       = [party]winDecoration.png

+PartyWinDeco2       = [party]winDecoration.png

+PartyWinDeco3       = [party]winDecoration.png

 PartyPlayerSelectBG = [party]playerselectbg.png

-Party1BG = Party1BG.png

-Party1Bar = Party1Bar.png

-Button         = [main]button.png

+Party1BG            = Party1BG.png

+Party1Bar           = Party1Bar.png

+Button              = [main]button.png

 

 StatsBox = StatsBox.png

 

@@ -129,7 +135,7 @@ Pause          = [sing]pause.png
 NoteStar        = [effect]goldenNoteStar.png

 NotePerfectStar = [effect]perfectNoteStar.png

 

-BGFade     = [special]bg_fade.png

+BGFade        = [special]bg_fade.png

 

 LyricIcon_P1  = [sing.player1]lyric_active.png

 LyricIconD_P1 = [sing.player1]lyric_inactive.png

diff --git a/game/themes/Candy/Clouds.ini b/game/themes/Candy/Clouds.ini
index cffcfe24..faa71d5a 100755
--- a/game/themes/Candy/Clouds.ini
+++ b/game/themes/Candy/Clouds.ini
@@ -1,13 +1,16 @@
 [Skin]

-Theme=Candy

-Name=Clouds

+Theme = Candy

+Name  = Clouds

+

 [Textures]

 Cursor = [interface]cursor.png

 Cursor_Pressed = [interface]cursor_pressed.png

 

 iconlogo = [icon]logo.png

 

-icon_song_video = [icon]song_video.png

+icon_song_video      = [icon]song_video.png

+icon_song_medley     = [icon]song_medley.png

+icon_song_calcmedley = [icon]song_calcmedley.png

 

 ButtonMain      = [button]main.png

 Transparent     = Transparent.png

@@ -15,7 +18,7 @@ MainBar         = [main]mainBar.png
 

 SelectBG       = [main]selectbg.png

 

-Select_ArrowLeft = [interface]select_arrow_left.png

+Select_ArrowLeft  = [interface]select_arrow_left.png

 Select_ArrowRight = [interface]select_arrow_right.png

 

 LoadingBG      = [bg-load]clouds.jpg

@@ -26,13 +29,13 @@ SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png

 SongCover      = [main]songCover.jpg

 PartyMenuBG    = [main]partymenubg.png

-SearchBG    = [main]searchbg.png

+SearchBG       = [main]searchbg.png

 

 LyricBar       = [sing]textBar.png

 

 LyricHelpBar   = [sing]lyricsHelpBar.png

 

-TimeBar      = [sing]timeBar.jpg

+TimeBar        = [sing]timeBar.jpg

 

 LineBonusBack  = [sing]scoreBg.png

 

@@ -46,6 +49,9 @@ P              = [sing]p.png
 

 Ball           = [sing]lyricsHelpBar.png

 

+#Song name for medley mode

+SongName       = [sing]SongName.png

+

 ScoreBox        = [score]box.png

 Scorepipe       = [score]pipe.png 

 ScoreLevel      = [score]level.png

@@ -84,24 +90,24 @@ Rating_5 = [score]rating_2.png
 Rating_6 = [score]rating_2.png

 Rating_7 = [score]rating_3.png

 

-Joker             =[party]Joker.png

-PartyPlayerButton =[party]playerButton.png

-PartyTeamButton1  =[party]roundTeamButton.png

-PartyTeamButton2  =[party]playerTeamButton.png

-PartyRoundBG1     =[party]roundBG1.png

-PartyRoundBG2     =[party]roundBG2.png

-PartyRoundBG3     =[party]roundBG3.png

-PartyRoundBG4     =[party]roundBG4.png

-HDL_Pointer       =[party]pointer.png

-PartyWinDeco1     =[party]winDecoration.png

-PartyWinDeco2     =[party]winDecoration.png

-PartyWinDeco3     =[party]winDecoration.png

+Joker               = [party]Joker.png

+PartyPlayerButton   = [party]playerButton.png

+PartyTeamButton1    = [party]roundTeamButton.png

+PartyTeamButton2    = [party]playerTeamButton.png

+PartyRoundBG1       = [party]roundBG1.png

+PartyRoundBG2       = [party]roundBG2.png

+PartyRoundBG3       = [party]roundBG3.png

+PartyRoundBG4       = [party]roundBG4.png

+HDL_Pointer         = [party]pointer.png

+PartyWinDeco1       = [party]winDecoration.png

+PartyWinDeco2       = [party]winDecoration.png

+PartyWinDeco3       = [party]winDecoration.png

 PartyPlayerSelectBG = [party]playerselectbg.png

-Party1BG = Party1BG.png

-Party1Bar = Party1Bar.png

-Button         = [main]button.png

+Party1BG            = Party1BG.png

+Party1Bar           = Party1Bar.png

+Button              = [main]button.png

 

-StatsBox = StatsBox.png

+StatsBox    = StatsBox.png

 

 ButtonP     = [button]p.png

 ButtonM     = [button]m.png

@@ -129,7 +135,7 @@ Pause          = [sing]pause.png
 NoteStar        = [effect]goldenNoteStar.png

 NotePerfectStar = [effect]perfectNoteStar.png

 

-BGFade     = [special]bg_fade.png

+BGFade        = [special]bg_fade.png

 

 LyricIcon_P1  = [sing.player1]lyric_active.png

 LyricIconD_P1 = [sing.player1]lyric_inactive.png

diff --git a/game/themes/Candy/[icon]song_calcmedley.png b/game/themes/Candy/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
--- /dev/null
+++ b/game/themes/Candy/[icon]song_calcmedley.png
diff --git a/game/themes/Candy/[icon]song_medley.png b/game/themes/Candy/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
--- /dev/null
+++ b/game/themes/Candy/[icon]song_medley.png
diff --git a/game/themes/Candy/[sing]SongName.png b/game/themes/Candy/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
--- /dev/null
+++ b/game/themes/Candy/[sing]SongName.png