From 09cb93c06202febc160b644b384a8d7d29978c04 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 23 Feb 2013 15:47:29 +0000
Subject: 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
---
game/fonts/fonts.ini | 20 +-
game/themes/Candy.ini | 120 ++-
game/themes/Candy/Clouds static.ini | 52 +-
game/themes/Candy/Clouds.ini | 52 +-
game/themes/Candy/[icon]song_calcmedley.png | Bin 0 -> 379 bytes
game/themes/Candy/[icon]song_medley.png | Bin 0 -> 384 bytes
game/themes/Candy/[sing]SongName.png | Bin 0 -> 973 bytes
game/themes/Classic.ini | 1008 ++++++++++------------
game/themes/Classic/Star.ini | 78 +-
game/themes/Classic/[icon]song_calcmedley.png | Bin 0 -> 379 bytes
game/themes/Classic/[icon]song_medley.png | Bin 0 -> 384 bytes
game/themes/Classic/[sing]SongName.png | Bin 0 -> 973 bytes
game/themes/Deluxe.ini | 139 ++-
game/themes/Deluxe/Blue.ini | 66 +-
game/themes/Deluxe/Fall.ini | 66 +-
game/themes/Deluxe/Ocean.ini | 66 +-
game/themes/Deluxe/Ribbon.ini | 65 +-
game/themes/Deluxe/Summer.ini | 66 +-
game/themes/Deluxe/Winter.ini | 66 +-
game/themes/Deluxe/[icon]song_calcmedley.png | Bin 0 -> 379 bytes
game/themes/Deluxe/[icon]song_medley.png | Bin 0 -> 384 bytes
game/themes/Deluxe/[sing]SongName.png | Bin 0 -> 973 bytes
game/themes/Temptation.ini | 116 ++-
game/themes/Temptation/Temptation (16-9).ini | 88 +-
game/themes/Temptation/Temptation (4-3).ini | 82 +-
game/themes/Temptation/[icon]song_calcmedley.png | Bin 0 -> 379 bytes
game/themes/Temptation/[icon]song_medley.png | Bin 0 -> 384 bytes
game/themes/Temptation/[sing]SongName.png | Bin 0 -> 973 bytes
game/themes/Verdure.ini | 152 ++--
game/themes/Verdure/Drippin.ini | 66 +-
game/themes/Verdure/Drippin_Low.ini | 66 +-
game/themes/Verdure/Drippin_Static.ini | 66 +-
game/themes/Verdure/Springtime.ini | 66 +-
game/themes/Verdure/Springtime_Low.ini | 66 +-
game/themes/Verdure/Springtime_Static.ini | 66 +-
game/themes/Verdure/[icon]song_calcmedley.png | Bin 0 -> 379 bytes
game/themes/Verdure/[icon]song_medley.png | Bin 0 -> 384 bytes
game/themes/Verdure/[sing]SongName.png | Bin 0 -> 973 bytes
src/base/TextGL.pas | 28 +-
src/base/UThemes.pas | 26 +-
src/screens/UScreenScore.pas | 13 +
src/screens/UScreenSing.pas | 27 +-
src/screens/UScreenSong.pas | 27 +-
43 files changed, 1477 insertions(+), 1342 deletions(-)
create mode 100755 game/themes/Candy/[icon]song_calcmedley.png
create mode 100755 game/themes/Candy/[icon]song_medley.png
create mode 100755 game/themes/Candy/[sing]SongName.png
create mode 100755 game/themes/Classic/[icon]song_calcmedley.png
create mode 100755 game/themes/Classic/[icon]song_medley.png
create mode 100755 game/themes/Classic/[sing]SongName.png
create mode 100755 game/themes/Deluxe/[icon]song_calcmedley.png
create mode 100755 game/themes/Deluxe/[icon]song_medley.png
create mode 100755 game/themes/Deluxe/[sing]SongName.png
create mode 100755 game/themes/Temptation/[icon]song_calcmedley.png
create mode 100755 game/themes/Temptation/[icon]song_medley.png
create mode 100755 game/themes/Temptation/[sing]SongName.png
create mode 100755 game/themes/Verdure/[icon]song_calcmedley.png
create mode 100755 game/themes/Verdure/[icon]song_medley.png
create mode 100755 game/themes/Verdure/[sing]SongName.png
diff --git a/game/fonts/fonts.ini b/game/fonts/fonts.ini
index f152852d..20e97e4e 100755
--- a/game/fonts/fonts.ini
+++ b/game/fonts/fonts.ini
@@ -5,20 +5,32 @@
;-------------------------------------------------
;[Font_XYZ]
;# the font file
-;File=Filename
+;File=Filename
+;
;# space between glyphs (default: 0.0)
;GlyphSpacing=float
+;
;# width stretch factor (default: 1.0)
;Stretch=float
+;
;# makes the font more bold (default: 0.0). Not used if Outline > 0.0.
;Embolden=float(>=0.0)
+;
;# draws an outline around the glyph
;Outline=float(>=0.0)
+;
;# outline color components (default: 0.0/0.0/0.0/-1.0)
;OutlineColorR/G/B=float([0..1])
+;
;# outline alpha, -1.0 for alpha of interior (default: -1.0)
;OutlineColorA=float([0..1] or -1)
;
+;# set the maximum resolution (default: 64)
+;MaxResolution=integer([16, 32, 64, 128, 256, 512, ...])
+;
+;# precache of font (default=1=true)
+;PreCache=integer([0;1])
+;
;[Font_...]
;...
;
@@ -51,6 +63,12 @@ Outline=0.06
File=FreeSans/FreeSansBold.ttf
Outline=0.06
+[Font_BoldHighRes]
+File=FreeSans/FreeSansBold.ttf
+MaxResolution=256
+PreCache=0
+Outline=0.02
+
[Fallbacks]
File1=wqy-microhei/wqy-microhei.ttc
;File2=C:/Windows/Fonts/simsun.ttc
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
Binary files /dev/null and b/game/themes/Candy/[icon]song_calcmedley.png differ
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
Binary files /dev/null and b/game/themes/Candy/[icon]song_medley.png differ
diff --git a/game/themes/Candy/[sing]SongName.png b/game/themes/Candy/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
Binary files /dev/null and b/game/themes/Candy/[sing]SongName.png differ
diff --git a/game/themes/Classic.ini b/game/themes/Classic.ini
index 8ea3fe83..d9a1ac6d 100644
--- a/game/themes/Classic.ini
+++ b/game/themes/Classic.ini
@@ -51,7 +51,6 @@ Size = 48
Text = SING_LOADING
Reflection = 0
-
[LoadingText2]
X = 780
Y = 570
@@ -62,23 +61,22 @@ Align = 2
Text = US_VERSION
Reflection = 0
-
[Main]
[MainBackground]
Tex = MainBG
[MainStatic1]
-X =30
-Y =235
-W =32
-H =32
+X = 30
+Y = 235
+W = 32
+H = 32
Tex = MainIcon
Color = ColorDark
Type = Transparent
[MainText1]
-X =30
-Y =170
+X = 30
+Y = 170
Color = GrayLight
Font = 1
Size = 66
@@ -86,35 +84,34 @@ Align = 0
Text = SING_MENU
[MainTextDescription]
-X =63
-Y =233
-Color=GrayDark
-Font =1
+X = 63
+Y = 233
+Color = GrayDark
+Font = 1
Size = 30
-Align=0
-Text=
+Align = 0
+Text =
[MainTextDescriptionLong]
-X =63
-Y =265
+X = 63
+Y = 265
Color = Black
Font = 0
Size = 30
Align = 0
-Text =
+Text =
[MainStatic2]
-X =30
-Y =270
-W =740
-H =283
+X = 30
+Y = 270
+W = 740
+H = 283
Tex = usdx_logo
Color = ColorDark
Type = Transparent
-
[MainStatic3]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -123,7 +120,7 @@ Color = White
Type = Transparent
[MainText4]
-X =570
+X = 570
Y = 548
Color = Black
Font = 0
@@ -134,14 +131,14 @@ Text = SING_EDITOR
[MainStatic4]
X = 126
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
[MainText2]
-X =166
+X = 166
Y = 548
Color = Black
Size = 24
@@ -149,7 +146,7 @@ Align = 0
Text = SING_LEGEND_NAVIGATE
[MainStatic5]
-X =340
+X = 340
Y = 545
W = 32
H = 30
@@ -158,7 +155,7 @@ Color = White
Type = Transparent
[MainText3]
-X =380
+X = 380
Y = 548
Color = Black
Font = 0
@@ -167,8 +164,8 @@ Align = 0
Text = SING_LEGEND_SELECT
[MainButtonSolo]
-X =430
-Y =195
+X = 430
+Y = 195
W = 64
H = 64
Tex = ButtonSolo
@@ -186,8 +183,8 @@ Text = SING_SING
Color = GrayDark
[MainButtonMulti]
-X =500
-Y =195
+X = 500
+Y = 195
W = 64
H = 64
Tex = ButtonMulti
@@ -205,8 +202,8 @@ Text = SING_MULTI
Color = GrayDark
[MainButtonStats]
-X =570
-Y =195
+X = 570
+Y = 195
W = 64
H = 64
Tex = ButtonStats
@@ -224,8 +221,8 @@ Text = SING_STATS
Color = GrayDark
[MainButtonOptions]
-X =640
-Y =195
+X = 640
+Y = 195
W = 64
H = 64
Tex = ButtonOptions
@@ -233,7 +230,6 @@ Color = ColorDark
DColor = Gray
Type = Transparent
-
[MainButtonOptionsText1]
X = 70
Y = 3
@@ -244,8 +240,8 @@ Text = SING_OPTIONS
Color = GrayDark
[MainButtonExit]
-X =710
-Y =195
+X = 710
+Y = 195
W = 64
H = 64
Tex = ButtonExit
@@ -253,7 +249,6 @@ Color = ColorDark
DColor = Gray
Type = Transparent
-
[MainButtonExitText1]
X = 75
Y = 10
@@ -269,19 +264,19 @@ Color = GrayDark
Tex = SongBG
[SongStaticNonParty1]
-X =20
-Y =500
-W =32
-H =32
+X = 20
+Y = 500
+W = 32
+H = 32
Color = ColorDark
Tex = MainIcon
Type = Transparent
[SongTextCat]
-X =50
-Y =500
-Color=GrayDark
-Font =1
+X = 50
+Y = 500
+Color = GrayDark
+Font = 1
Size = 24
Align = 0
Text = SING_SONG_SELECTION_DESC
@@ -299,94 +294,112 @@ Reflection = 1
ReflectionSpacing = 2
[SongStatic2]
-X =0
-Y =100
-W =800
-H =350
+X = 0
+Y = 100
+W = 800
+H = 350
Z = 0.1
-Color=GrayLight
-Tex =SongFade
+Color = GrayLight
+Tex = SongFade
Type = Colorized
[SongCover]
-X=300
-Y=140
-W=300
-H=200
-Style=4
-Reflections=0
+X = 300
+Y = 140
+W = 300
+H = 200
+Style = 4
+Reflections = 0
[SongEqualizer]
Visible = 1
Direction = 1
-Color =Black
+Color = Black
Alpha = 1
-X=378
-Y=488
-PieceW=8
-PieceH=3
-Space=1
-Bands=5
-Length=7
+X = 378
+Y = 488
+PieceW = 8
+PieceH = 3
+Space = 1
+Bands = 5
+Length = 7
[SongVideoIcon]
-X=450
-Y=462
-W =32
-H =32
-Z=1
-Color=White
+X = 450
+Y = 462
+W = 32
+H = 32
+Z = 1
+Color = White
Tex = icon_song_video
Type = Transparent
+[SongMedleyIcon]
+X = 490
+Y = 462
+W = 32
+H = 32
+Z = 1
+Color = White
+Tex = icon_song_medley
+Type = Transparent
+
+[SongCalculatedMedleyIcon]
+X = 490
+Y = 462
+W = 32
+H = 32
+Z = 1
+Color = White
+Tex = icon_song_calcmedley
+Type = Transparent
[SongStatic3]
-X =270
-Y =120
-W =260
-H =240
-Z =0.95
+X = 270
+Y = 120
+W = 260
+H = 240
+Z = 0.95
Color = Gray
Tex = SongSelection
Type = Transparent
[SongStatic4]
-X =378
-Y =463
+X = 378
+Y = 463
Z = 0.8
-W =44
-H =28
-Color =Black
-Tex =SongEqualizerBG
+W = 44
+H = 28
+Color = Black
+Tex = SongEqualizerBG
Type = Colorized
-
[SongTextArtist]
-X =400
-Y =360
-Color=Black
-Font =0
+X = 400
+Y = 360
+Color = Black
+Font = 0
Size = 27
-Align =1
-Text=
+Align = 1
+Text =
[SongTextTitle]
-X =400
-Y =390
-Color=GrayDark
-Font =0
+X = 400
+Y = 390
+Color = GrayDark
+Font = 0
Size = 27
-Align =1
-Text=
+Align = 1
+Text =
[SongTextNumber]
-X =400
-Y =425
-Color=Gray
-Font =1
+X = 400
+Y = 425
+Color = Gray
+Font = 1
Size = 21
-Align =1
-Text=
+Align = 1
+Text =
#Variable statics and texts for song-screen in sing- and partymode
# There can be an unlimited Number of Statics and Texts, As long
@@ -402,10 +415,10 @@ Text=
#Here are the ones for singmode
[SongTextNonParty1]
-X =30
-Y =455
-Color=GrayLight
-Font =1
+X = 30
+Y = 455
+Color = GrayLight
+Font = 1
Size = 45
Text = SING_SONG_SELECTION
Align = 0
@@ -413,8 +426,8 @@ Align = 0
# NAVBAR #########################
# Jump to a letter with [ALT] + [A..Z]
[SongStaticNonParty2]
-X =110
-Y =553
+X = 110
+Y = 553
W = 32
H = 30
Z = 0.952
@@ -422,10 +435,9 @@ Tex = ButtonAlt
Color = White
Type = Transparent
-
[SongTextNonParty2]
X = 142
-Y =553
+Y = 553
Z = 0.952
Color = Black
Font = 0
@@ -433,10 +445,9 @@ Size = 24
Align = 0
Text = +
-
[SongStaticNonParty3]
-X =155
-Y =553
+X = 155
+Y = 553
W = 32
H = 30
Z = 0.952
@@ -444,7 +455,6 @@ Tex = ButtonAZ
Color = White
Type = Transparent
-
[SongTextNonParty3]
X = 195
Y = 555
@@ -455,11 +465,10 @@ Size = 24
Align = 0
Text = SING_SONG_SELECTION_GOTO
-
# Menu opens with [M]
[SongStaticNonParty4]
X = 305
-Y =553
+Y = 553
W = 32
H = 30
Z = 0.952
@@ -467,7 +476,6 @@ Tex = ButtonM
Color = White
Type = Transparent
-
[SongTextNonParty4]
X = 345
Y = 555
@@ -478,7 +486,6 @@ Size = 24
Align = 0
Text = SING_SONG_SELECTION_MENU
-
# The so famous search, shown with [J]
[SongStaticNonParty5]
X = 420
@@ -500,7 +507,6 @@ Size = 24
Align = 0
Text = SONG_JUMPTO_DESC
-
# [P]laylist
[SongStaticNonParty6]
X = 600
@@ -512,7 +518,6 @@ Tex = ButtonP
Color = White
Type = Transparent
-
[SongTextNonParty6]
X = 640
Y = 555
@@ -523,13 +528,12 @@ Size = 24
Align = 0
Text = SING_SONG_SELECTION_PLAYLIST
-
#and these are the ones for partymode
[SongStaticParty1]
-X =20
-Y =500
-W =32
-H =32
+X = 20
+Y = 500
+W = 32
+H = 32
Color = ColorDark
Tex = MainIcon
Type = Transparent
@@ -539,24 +543,23 @@ Type = Transparent
[SongStaticParty2]
X = 126
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = Button13
Color = White
Type = Transparent
[SongTextParty2]
-X =166
+X = 166
Y = 548
Color = Black
Size = 24
Align = 0
Text = SONG_MENU_NAME_PARTY_JOKER
-
# menu
[SongStaticParty3]
-X =330
+X = 330
Y = 545
W = 32
H = 30
@@ -565,7 +568,7 @@ Color = White
Type = Transparent
[SongTextParty3]
-X =370
+X = 370
Y = 548
Color = Black
Font = 0
@@ -573,9 +576,8 @@ Size = 24
Align = 0
Text = PARTY_SONG_MENU
-
[SongStaticParty4]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -584,7 +586,7 @@ Color = White
Type = Transparent
[SongTextParty4]
-X =570
+X = 570
Y = 548
Color = Black
Font = 0
@@ -592,13 +594,12 @@ Size = 24
Align = 0
Text = PARTY_SONG_LEGEND_CONTINUE
-
#Texts for Party Mode
[SongTextParty1]
-X =30
-Y =455
-Color=GrayLight
-Font =1
+X = 30
+Y = 455
+Color = GrayLight
+Font = 1
Size = 45
Text = PARTY_MODE
@@ -607,10 +608,10 @@ Text = PARTY_MODE
# Jokers, 5 for each team, only shown in party Mode
[SongStaticTeam1Joker1]
Tex = Joker
-X =20
-Y =30
-W =50
-H =50
+X = 20
+Y = 30
+W = 50
+H = 50
Color = P1Dark
Type = Transparent
TexX1 = 0
@@ -620,10 +621,10 @@ TexY2 = 1
[SongStaticTeam1Joker2]
Tex = Joker
-X =70
-Y =30
-W =50
-H =50
+X = 70
+Y = 30
+W = 50
+H = 50
Color = P1Dark
Type = Transparent
TexX1 = 0
@@ -633,10 +634,10 @@ TexY2 = 1
[SongStaticTeam1Joker3]
Tex = Joker
-X =120
-Y =30
-W =50
-H =50
+X = 120
+Y = 30
+W = 50
+H = 50
Color = P1Dark
Type = Transparent
TexX1 = 0
@@ -646,10 +647,10 @@ TexY2 = 1
[SongStaticTeam1Joker4]
Tex = Joker
-X =170
-Y =30
-W =50
-H =50
+X = 170
+Y = 30
+W = 50
+H = 50
Color = P1Dark
Type = Transparent
TexX1 = 0
@@ -659,10 +660,10 @@ TexY2 = 1
[SongStaticTeam1Joker5]
Tex = Joker
-X =220
-Y =30
-W =50
-H =50
+X = 220
+Y = 30
+W = 50
+H = 50
Color = P1Dark
Type = Transparent
TexX1 = 0
@@ -672,10 +673,10 @@ TexY2 = 1
[SongStaticTeam2Joker1]
Tex = Joker
-X =280
-Y =30
-W =50
-H =50
+X = 280
+Y = 30
+W = 50
+H = 50
Color = P2Dark
Type = Transparent
TexX1 = 0
@@ -685,10 +686,10 @@ TexY2 = 1
[SongStaticTeam2Joker2]
Tex = Joker
-X =330
-Y =30
-W =50
-H =50
+X = 330
+Y = 30
+W = 50
+H = 50
Color = P2Dark
Type = Transparent
TexX1 = 0
@@ -698,10 +699,10 @@ TexY2 = 1
[SongStaticTeam2Joker3]
Tex = Joker
-X =380
-Y =30
-W =50
-H =50
+X = 380
+Y = 30
+W = 50
+H = 50
Color = P2Dark
Type = Transparent
TexX1 = 0
@@ -711,10 +712,10 @@ TexY2 = 1
[SongStaticTeam2Joker4]
Tex = Joker
-X =430
-Y =30
-W =50
-H =50
+X = 430
+Y = 30
+W = 50
+H = 50
Color = P2Dark
Type = Transparent
TexX1 = 0
@@ -724,10 +725,10 @@ TexY2 = 1
[SongStaticTeam2Joker5]
Tex = Joker
-X =480
-Y =30
-W =50
-H =50
+X = 480
+Y = 30
+W = 50
+H = 50
Color = P2Dark
Type = Transparent
TexX1 = 0
@@ -737,10 +738,10 @@ TexY2 = 1
[SongStaticTeam3Joker1]
Tex = Joker
-X =540
-Y =30
-W =50
-H =50
+X = 540
+Y = 30
+W = 50
+H = 50
Color = P3Dark
Type = Transparent
TexX1 = 0
@@ -750,10 +751,10 @@ TexY2 = 1
[SongStaticTeam3Joker2]
Tex = Joker
-X =590
-Y =30
-W =50
-H =50
+X = 590
+Y = 30
+W = 50
+H = 50
Color = P3Dark
Type = Transparent
TexX1 = 0
@@ -763,10 +764,10 @@ TexY2 = 1
[SongStaticTeam3Joker3]
Tex = Joker
-X =640
-Y =30
-W =50
-H =50
+X = 640
+Y = 30
+W = 50
+H = 50
Color = P3Dark
Type = Transparent
TexX1 = 0
@@ -776,10 +777,10 @@ TexY2 = 1
[SongStaticTeam3Joker4]
Tex = Joker
-X =690
-Y =30
-W =50
-H =50
+X = 690
+Y = 30
+W = 50
+H = 50
Color = P3Dark
Type = Transparent
TexX1 = 0
@@ -789,10 +790,10 @@ TexY2 = 1
[SongStaticTeam3Joker5]
Tex = Joker
-X =740
-Y =30
-W =50
-H =50
+X = 740
+Y = 30
+W = 50
+H = 50
Color = P3Dark
Type = Transparent
TexX1 = 0
@@ -800,68 +801,67 @@ TexY1 = 0
TexX2 = 1
TexY2 = 1
-
[Sing]
Texts = 1
[SingBackground]
-Type=color
-ColR=1
-ColB=1
-ColG=1
+Type = color
+ColR = 1
+ColB = 1
+ColG = 1
[SingText1]
-Text =SING_TIME
-X =43
-Y =17
-Font =1
+Text = SING_TIME
+X = 43
+Y = 17
+Font = 1
Size = 18
-Color =Black
-Align=1
+Color = Black
+Align = 1
[SingStatic1]
;TextBG
-Tex =LyricBar
-X =10
-Y =490
-W =780
-H =105
-Color =GrayLightest
+Tex = LyricBar
+X = 10
+Y = 490
+W = 780
+H = 105
+Color = GrayLightest
Type = Transparent
[SingStatic2]
;TimeBar
-Tex =LyricBar
-X =12
-Y =5
-W =328
-H =42
-Color =GrayLightest
+Tex = LyricBar
+X = 12
+Y = 5
+W = 328
+H = 42
+Color = GrayLightest
Type = Transparent
[SingStatic3]
-Tex =Rectangle
-X =140
-Y =21
-W =190
-H =10
-Color=Gray
+Tex = Rectangle
+X = 140
+Y = 21
+W = 190
+H = 10
+Color = Gray
[SingTimeProgress]
-X =140
-Y =21
-W =190
-H =10
-Color=GrayDark
+X = 140
+Y = 21
+W = 190
+H = 10
+Color = GrayDark
[SingTimeText]
-Text =SING_TIME
-X =100
-Y =14
-Font =1
+Text = SING_TIME
+X = 100
+Y = 14
+Font = 1
Size = 24
-Color =White
-Align=1
+Color = White
+Align = 1
# O N E P L A Y E R M O D E # # # # # # # # # # # # # # # # # # # #
#PlayerOne
@@ -1124,6 +1124,24 @@ Y = 95
W = 100
H = 8
+[SingSongNameStatic]
+Tex = SongName
+X = 350
+Y = 5
+W = 440
+H = 42
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 570
+Y = 15
+Font = 1
+Size = 20
+Color = Black
+Align = 1
+
[Score]
Texts = 1
@@ -1134,7 +1152,7 @@ Tex = ScoreScreenBG
X = 70
Y = 6
Color = GrayLight
-Font =1
+Font = 1
Size = 60
Text = SONG_SCORE
Align = 0
@@ -1157,7 +1175,6 @@ Color = ColorDark
Tex = MainIcon
Type = Transparent
-
[ScoreStatic2]
X = 0
Y = 545
@@ -1181,7 +1198,7 @@ Reflection = 1
ReflectionSpacing = 2
[ScoreStatic4]
-X =350
+X = 200
Y = 545
W = 32
H = 30
@@ -1190,7 +1207,7 @@ Color = White
Type = Transparent
[ScoreText2]
-X =390
+X = 240
Y = 548
Color = Black
Font = 0
@@ -1341,7 +1358,6 @@ H = 23
Type = Transparent
Color = White
-
[ScoreTextTotal1]
X = 237
Y = 454
@@ -1351,7 +1367,6 @@ Size = 30
Text = SING_TOTAL
Align = 0
-
[ScoreTextTotalSCore1]
X = 487
Y = 444
@@ -1408,7 +1423,6 @@ z = 0.9
Color = P1Dark
Type = Colorized
-
[ScorePlayer1Static4]
Tex = ScoreGlassBox
X = 499
@@ -1535,7 +1549,6 @@ Font = 0
Size = 30
Text = SING_TOTAL
-
[ScoreTextTotalSCore2]
X = 283
Y = 444
@@ -1545,7 +1558,6 @@ Size = 42
Align = 2
Text = 00000
-
# Lines
[ScorePlayer2Static1]
Tex = ScoreLine
@@ -1574,7 +1586,6 @@ H = 23
Type = Transparent
Color = White
-
#ScoreBar
[ScoreStaticBackLevel2]
Tex = ScoreLevel
@@ -1622,7 +1633,6 @@ z = 0.9
Color = P1Dark
Type = Colorized
-
[ScorePlayer2Static4]
Tex = ScoreGlassBox
X = 294
@@ -1749,7 +1759,6 @@ Size = 30
Text = SING_TOTAL
Align = 2
-
[ScoreTextTotalScore3]
X = 517
Y = 444
@@ -1759,7 +1768,6 @@ Size = 42
Align = 0
Text = 00000
-
#Lines
[ScorePlayer3Static1]
Tex = ScoreLine
@@ -1788,7 +1796,6 @@ H = 23
Type = Transparent
Color = White
-
#ScoreBar
[ScoreStaticBackLevel3]
Tex = ScoreLevel
@@ -1836,7 +1843,6 @@ z = 0.9
Color = P2Dark
Type = Colorized
-
[ScorePlayer3Static4]
Tex = ScoreGlassBox
X = 405
@@ -1937,7 +1943,6 @@ Align = 0
Text = SING_TOTAL
Color = Black
-
[ScoreTextTotalScore4]
X = 260
Y = 361
@@ -1947,7 +1952,6 @@ Align = 2
Text = 00000
Color = Black
-
[ScoreStaticBoxDark4]
Tex = PlayerNumberBox
X = 20
@@ -1958,7 +1962,6 @@ Type = Colorized
Color = P1Dark
Z = 0.9
-
[ScorePlayer4Text1]
X = 24
Y = 376
@@ -2125,7 +2128,6 @@ Type = Colorized
Color = P2Dark
Z = 0.9
-
[ScorePlayer5Text1]
X = 284
Y = 376
@@ -2291,7 +2293,6 @@ Type = Colorized
Color = P3Dark
Z = 0.9
-
[ScorePlayer6Text1]
X = 544
Y = 376
@@ -2350,6 +2351,23 @@ Tex = ScoreLine
Type = Transparent
Color = Gray
+[ScoreStaticNavigate]
+X = 450
+Y = 545
+W = 32
+H = 30
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+
+[ScoreTextNavigate]
+X = 490
+Y = 548
+Color = Black
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+
[Options]
Texts = 6
Fade = 2
@@ -2358,10 +2376,10 @@ Fade = 2
Tex = OptionsBG
[OptionsStatic1]
-X=40
-Y=250
-W=32
-H=32
+X = 40
+Y = 250
+W = 32
+H = 32
Color = ColorDark
Tex = MainIcon
Type = Transparent
@@ -2375,7 +2393,6 @@ Size = 75
Text = SING_OPTIONS
Align = 0
-
[OptionsTextDescription]
X = 70
Y = 248
@@ -2383,29 +2400,27 @@ Color = GrayDark
Font = 1
Size = 30
Align = 0
-Text =
+Text =
[OptionsStatic2]
X = 156
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
-
[OptionsText2]
-X =196
+X = 196
Y = 548
Color = Black
Size = 24
Align = 0
Text = SING_LEGEND_NAVIGATE
-
[OptionsStatic3]
-X =340
+X = 340
Y = 545
W = 32
H = 30
@@ -2413,18 +2428,16 @@ Tex = ButtonEnter
Color = White
Type = Transparent
-
[OptionsText3]
-X =380
+X = 380
Y = 548
Color = Black
Size = 24
Align = 0
Text = SING_LEGEND_SELECT
-
[OptionsStatic4]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -2432,16 +2445,14 @@ Tex = ButtonEsc
Color = White
Type = Transparent
-
[OptionsText4]
-X =570
+X = 570
Y = 548
Color = Black
Size = 24
Align = 0
Text = SING_LEGEND_ESC
-
[OptionsButtonGame]
X = 40
Y = 310
@@ -2453,10 +2464,9 @@ DColor = Gray
Type = Transparent
Texts = 1
-
[OptionsButtonGameText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2474,10 +2484,9 @@ DColor = Gray
Type = Transparent
Texts = 1
-
[OptionsButtonGraphicsText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2496,8 +2505,8 @@ Type = Transparent
Texts = 1
[OptionsButtonSoundText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2517,8 +2526,8 @@ Align = 0
Texts = 1
[OptionsButtonLyricsText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2537,10 +2546,9 @@ Type = Transparent
Align = 0
Texts = 1
-
[OptionsButtonThemesText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2560,8 +2568,8 @@ Align = 0
Texts = 1
[OptionsButtonRecordText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2582,8 +2590,8 @@ Align = 0
Texts = 1
[OptionsButtonAdvancedText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2603,10 +2611,9 @@ Type = Transparent
Align = 0
Texts = 1
-
[OptionsButtonExitText1]
-X =20
-Y =20
+X = 20
+Y = 20
Font = 1
Size = 32
Align = 0
@@ -2636,7 +2643,6 @@ Color = Gray
Size = 65
Text = SING_OPTIONS
-
[OptionsGameText2]
X = 105
Y = 80
@@ -2644,7 +2650,6 @@ Color = Gray
Size = 30
Text = SING_OPTIONS_GAME_WHEREAMI
-
[OptionsGameStatic2]
X = 250
Y = 545
@@ -2654,7 +2659,6 @@ Tex = ButtonNavi
Color = White
Type = Transparent
-
[OptionsGameText3]
X = 290
Y = 548
@@ -2672,7 +2676,6 @@ Tex = ButtonEsc
Color = White
Type = Transparent
-
[OptionsGameText4]
X = 450
Y = 548
@@ -2846,7 +2849,6 @@ Color = Gray
Size = 65
Text = SING_OPTIONS
-
[OptionsGraphicsText2]
X = 105
Y = 80
@@ -3060,7 +3062,6 @@ Color = Gray
Size = 30
Text = SING_OPTIONS_SOUND_WHEREAMI
-
[OptionsSoundStatic2]
X = 250
Y = 545
@@ -3296,7 +3297,6 @@ Color = ColorDark
Tex = MainIcon
Type = Transparent
-
[OptionsLyricsText1]
X = 70
Y = 15
@@ -3437,7 +3437,6 @@ Color = ColorDark
Tex = MainIcon
Type = Transparent
-
[OptionsThemesText1]
X = 70
Y = 15
@@ -3748,7 +3747,6 @@ Color = Gray
Size = 65
Text = SING_OPTIONS
-
[OptionsAdvancedText2]
X = 105
Y = 80
@@ -3795,7 +3793,6 @@ Color = Black
Size = 24
Text = SING_LEGEND_NAVIGATE
-
[OptionsAdvancedStatic5]
X = 410
Y = 545
@@ -3986,7 +3983,7 @@ Tex = Top5BG
X = 70
Y = 6
Color = GrayLight
-Font =1
+Font = 1
Size = 60
Text = SING_TOP_5_CHARTS
@@ -4174,7 +4171,6 @@ Size = 42
Align = 2
Text = 00000
-
[Top5TextDate1]
X = 760
Y = 190
@@ -4350,17 +4346,16 @@ Text = SING_EDIT_MENU_DESCRIPTION
# Navigate button text
[EditText3]
-X =166
+X = 166
Y = 548
Color = Black
Size = 24
Align = 0
Text = SING_EDIT_NAVIGATE
-
# Select button text
[EditText4]
-X =350
+X = 350
Y = 548
Color = Black
Font = 0
@@ -4368,10 +4363,9 @@ Size = 24
Align = 0
Text = SING_EDIT_SELECT
-
# Esc button text
[EditText5]
-X =570
+X = 570
Y = 548
Color = Black
Font = 0
@@ -4379,7 +4373,6 @@ Size = 24
Align = 0
Text = SING_EDIT_EXIT
-
[EditTextDescription]
X = 95
Y = 195
@@ -4414,15 +4407,14 @@ ReflectionSpacing = 2
[EditStatic4]
X = 126
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
-
[EditStatic5]
-X =310
+X = 310
Y = 545
W = 32
H = 30
@@ -4431,7 +4423,7 @@ Color = White
Type = Transparent
[EditStatic6]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -4488,31 +4480,31 @@ Texts = 5
Tex = MainBG
[LevelStatic1]
-X=20
-Y=250
-W=32
-H=32
+X = 20
+Y = 250
+W = 32
+H = 32
Color = ColorDark
Tex = MainIcon
Type = Transparent
[LevelText1]
-X=30
-Y=180
-Font=1
+X = 30
+Y = 180
+Font = 1
Size = 66
-Align=0
+Align = 0
Text = SING_MODE
-Color=GrayLight
+Color = GrayLight
[LevelText2]
-X=50
-Y=248
-Font=1
+X = 50
+Y = 248
+Font = 1
Size = 30
-Align=0
-Text=SING_PLAYER_DESC
-Color=GrayDark
+Align = 0
+Text = SING_PLAYER_DESC
+Color = GrayDark
[LevelStatic2]
X = 0
@@ -4539,14 +4531,14 @@ ReflectionSpacing = 2
[LevelStatic4]
X = 216
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
[LevelStatic5]
-X =400
+X = 400
Y = 545
W = 32
H = 30
@@ -4554,18 +4546,16 @@ Tex = ButtonEnter
Color = White
Type = Transparent
-
[LevelText3]
-X =256
+X = 256
Y = 548
Color = Black
Size = 24
Align = 0
Text = SING_LEGEND_NAVIGATE
-
[LevelText4]
-X =440
+X = 440
Y = 548
Color = Black
Font = 0
@@ -4573,102 +4563,99 @@ Size = 24
Align = 0
Text = SING_DIFFICULTY_CONTINUE
-
[LevelButtonEasy]
-Tex=Button
-X=25
-Y=310
-W=250
-H=70
+Tex = Button
+X = 25
+Y = 310
+W = 250
+H = 70
Color = ColorDark
DColor = Gray
Type = Transparent
Texts = 1
[LevelButtonMedium]
-Tex=Button
-X=275
-Y=310
-W=250
-H=70
+Tex = Button
+X = 275
+Y = 310
+W = 250
+H = 70
Color = ColorDark
DColor = Gray
Type = Transparent
Texts = 1
-
[LevelButtonHard]
-Tex=Button
-X=525
-Y=310
-W=250
-H=70
+Tex = Button
+X = 525
+Y = 310
+W = 250
+H = 70
Tex = Button
Color = ColorDark
DColor = Gray
Type = Transparent
Texts = 1
-
[LevelButtonEasyText1]
-X=115
-Y=20
-Font=1
+X = 115
+Y = 20
+Font = 1
Size = 27
-Align=1
-Text=SING_EASY
-Color=White
+Align = 1
+Text = SING_EASY
+Color = White
[LevelButtonMediumText1]
-X=115
-Y=20
-Font=1
+X = 115
+Y = 20
+Font = 1
Size = 27
-Align=1
-Text=SING_MEDIUM
-Color=White
+Align = 1
+Text = SING_MEDIUM
+Color = White
[LevelButtonHardText1]
-X=115
-Y=20
-Font=1
+X = 115
+Y = 20
+Font = 1
Size = 27
-Align=1
-Text=SING_HARD
-Color=White
+Align = 1
+Text = SING_HARD
+Color = White
[Name]
Texts = 2
[NameBackground]
-Tex = MainBG
+Tex = MainBG
[NameStatic1]
-X=20
-Y=250
-W=32
-H=32
+X = 20
+Y = 250
+W = 32
+H = 32
Color = ColorDark
Tex = MainIcon
Type = Transparent
[NameText1]
-X=30
-Y=180
-Font=1
+X = 30
+Y = 180
+Font = 1
Size = 66
-Align=0
+Align = 0
Text = SING_MODE
-Color=GrayLight
+Color = GrayLight
[NameText2]
-X=50
-Y=248
-Font=1
+X = 50
+Y = 248
+Font = 1
Size = 30
-Align=0
-Text=SING_PLAYER_DESC
-Color=GrayDark
+Align = 0
+Text = SING_PLAYER_DESC
+Color = GrayDark
[NameStatic2]
X = 0
@@ -4695,14 +4682,14 @@ ReflectionSpacing = 2
[NameStatic4]
X = 126
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
[NameText3]
-X =166
+X = 166
Y = 548
Color = Black
Size = 24
@@ -4710,7 +4697,7 @@ Align = 0
Text = SING_LEGEND_NAVIGATE
[NameStatic5]
-X =310
+X = 310
Y = 545
W = 32
H = 30
@@ -4718,9 +4705,8 @@ Tex = ButtonAZ
Color = White
Type = Transparent
-
[NameText4]
-X =350
+X = 350
Y = 548
Color = Black
Font = 0
@@ -4729,7 +4715,7 @@ Align = 0
Text = SING_PLAYER_ENTER_NAME
[NameStatic6]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -4737,9 +4723,8 @@ Tex = ButtonEnter
Color = White
Type = Transparent
-
[NameText5]
-X =570
+X = 570
Y = 548
Color = Black
Font = 0
@@ -4747,132 +4732,125 @@ Size = 24
Align = 0
Text = SING_LEGEND_CONTINUE
-
[NameButtonPlayer1]
-X=25
-Y=310
-W=250
-H=70
+X = 25
+Y = 310
+W = 250
+H = 70
Tex = Button
Color = P1Dark
DColor = P1Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer1Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[NameButtonPlayer2]
X = 275
-Y=310
-W=250
-H=70
+Y = 310
+W = 250
+H = 70
Tex = Button
Color = P2Dark
DColor = P2Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer2Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[NameButtonPlayer3]
X = 525
-Y=310
-W=250
-H=70
+Y = 310
+W = 250
+H = 70
Tex = Button
Color = P3Dark
DColor = P3Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer3Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[NameButtonPlayer4]
-X=25
-Y=400
-W=250
-H=70
+X = 25
+Y = 400
+W = 250
+H = 70
Tex = Button
Color = P4Dark
DColor = P4Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer4Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[NameButtonPlayer5]
X = 275
-Y=400
-W=250
-H=70
+Y = 400
+W = 250
+H = 70
Tex = Button
Color = P5Dark
DColor = P5Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer5Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[NameButtonPlayer6]
X = 525
-Y=400
-W=250
-H=70
+Y = 400
+W = 250
+H = 70
Tex = Button
Color = P6Dark
DColor = P6Light
Type = Transparent
Texts = 1
-
[NameButtonPlayer6Text1]
-X=115
-Y=20
+X = 115
+Y = 20
Font = 0
Size = 30
Align = 1
Color = White
-Text =
+Text =
[PartyNewRound]
Texts = 7
@@ -5089,7 +5067,6 @@ Type = Transparent
Texts = 1
Color = P2Dark
-
[PartyNewRoundStaticNextPlayer3]
Tex = PartyPlayerButton
X = 495
@@ -5101,7 +5078,6 @@ Texts = 1
Color = P3Dark
-
[PartyNewRoundTextRound1]
X = 460
Y = 133
@@ -5388,7 +5364,6 @@ Size = 30
Text = Player 3
Align = 1
-
[PartyScore]
Texts = 5
@@ -5470,7 +5445,6 @@ Size = 30
Align = 0
Text = PARTY_SCORE_DESC
-
[PartyScoreText3]
X = 370
Y = 555
@@ -5589,7 +5563,6 @@ H = 50
Type = Transparent
Color = P1Dark
-
[PartyScoreStaticTeam1Deco]
Tex = PartyScoreDeco
X = 563
@@ -5599,7 +5572,6 @@ H = 64
Type = Transparent
Color = Gold
-
[PartyScoreStaticTeam2]
X = 188
Y = 330
@@ -5610,7 +5582,6 @@ Tex = PartyTeamPoints
Color = P2Dark
Type = Transparent
-
[PartyScoreStaticTeam2BG]
Tex = PartyTeamButton2
X = 178
@@ -5620,7 +5591,6 @@ H = 50
Type = Transparent
Color = P2Dark
-
[PartyScoreStaticTeam2Deco]
Tex = PartyScoreDeco
X = 563
@@ -5630,7 +5600,6 @@ H = 64
Type = Transparent
Color = Gold
-
[PartyScoreStaticTeam3]
X = 188
Y = 430
@@ -5641,7 +5610,6 @@ Tex = PartyTeamPoints
Color = P3Dark
Type = Transparent
-
[PartyScoreStaticTeam3BG]
Tex = PartyTeamButton2
X = 178
@@ -5651,7 +5619,6 @@ H = 50
Type = Transparent
Color = P3Dark
-
[PartyScoreStaticTeam3Deco]
Tex = PartyScoreDeco
X = 563
@@ -5661,7 +5628,6 @@ H = 64
Type = Transparent
Color = Gold
-
[PartyWin]
Texts = 4
@@ -5811,7 +5777,6 @@ Tex = PartyTeamPoints
Color = TeamColor
Type = Transparent
-
[PartyWinStaticTeam1BG]
Tex = PartyTeamButton3
X = 159
@@ -5821,7 +5786,6 @@ H = 65
Type = Transparent
Color = TeamColor
-
[PartyWinStaticTeam1Rank1]
X = 169
Y = 230
@@ -5832,7 +5796,6 @@ Tex = PartyTeamPoints
Color = P1Dark
Type = Transparent
-
[PartyWinStaticTeam1BGRank1]
Tex = PartyTeamButton3
X = 159
@@ -5861,7 +5824,6 @@ H = 50
Type = Transparent
Color = P1Dark
-
[PartyWinStaticTeam1Rank3]
X = 369
Y = 420
@@ -5881,7 +5843,6 @@ H = 40
Type = Transparent
Color = P1Dark
-
[PartyWinStaticTeam1Deco]
Tex = PartyWinDeco1
X = 91
@@ -5891,7 +5852,6 @@ H = 79
Type = Colorized
Color = Gold
-
[PartyWinStaticTeam2]
X = 289
Y = 330
@@ -5902,7 +5862,6 @@ Tex = PartyTeamPoints
Color = TeamColor
Type = Colorized
-
[PartyWinStaticTeam2BG]
Tex = PartyTeamButton4
X = 279
@@ -5912,7 +5871,6 @@ H = 50
Type = Transparent
Color = TeamColor
-
[PartyWinStaticTeam2Rank1]
X = 169
Y = 230
@@ -5923,7 +5881,6 @@ Tex = PartyTeamButton3
Color = P2Dark
Type = Transparent
-
[PartyWinStaticTeam2BGRank1]
Tex = PartyTeamButton4
X = 159
@@ -5933,7 +5890,6 @@ H = 65
Type = Transparent
Color = P2Dark
-
[PartyWinStaticTeam2Rank2]
X = 289
Y = 330
@@ -5944,7 +5900,6 @@ Tex = PartyTeamPoints
Color = P2Dark
Type = Transparent
-
[PartyWinStaticTeam2BGRank2]
Tex = PartyTeamButton4
X = 279
@@ -5954,7 +5909,6 @@ H = 50
Type = Transparent
Color = P2Dark
-
[PartyWinStaticTeam2Rank3]
X = 369
Y = 420
@@ -5965,7 +5919,6 @@ Tex = PartyTeamPoints
Color = TeamColor
Type = Transparent
-
[PartyWinStaticTeam2BGRank3]
Tex = PartyTeamButton4
X = 359
@@ -5975,7 +5928,6 @@ H = 40
Type = Colorized
Color = TeamColor
-
[PartyWinStaticTeam2Deco]
Tex = PartyWinDeco2
X = 226
@@ -5985,7 +5937,6 @@ H = 64
Type = Colorized
Color = Silver
-
[PartyWinStaticTeam3]
X = 369
Y = 420
@@ -5996,7 +5947,6 @@ Tex = PartyTeamPoints
Color = TeamColor
Type = Colorized
-
[PartyWinStaticTeam3BG]
Tex = PartyTeamButton5
X = 359
@@ -6006,7 +5956,6 @@ H = 40
Type = Colorized
Color = TeamColor
-
[PartyWinStaticTeam3Rank1]
X = 169
Y = 230
@@ -6017,7 +5966,6 @@ Tex = PartyTeamPoints
Color = P3Dark
Type = Colorized
-
[PartyWinStaticTeam3BGRank1]
Tex = PartyTeamButton3
X = 159
@@ -6027,7 +5975,6 @@ H = 65
Type = Colorized
Color = P3Dark
-
[PartyWinStaticTeam3Rank2]
X = 289
Y = 330
@@ -6038,7 +5985,6 @@ Tex = PartyTeamPoints
Color = P3Dark
Type = Colorized
-
[PartyWinStaticTeam3BGRank2]
Tex = PartyTeamButton5
X = 279
@@ -6048,7 +5994,6 @@ H = 50
Type = Colorized
Color = P3Dark
-
[PartyWinStaticTeam3Rank3]
X = 369
Y = 420
@@ -6059,7 +6004,6 @@ Tex = PartyTeamPoints
Color = P3Dark
Type = Colorized
-
[PartyWinStaticTeam3BGRank3]
Tex = PartyTeamButton5
X = 359
@@ -6069,7 +6013,6 @@ H = 40
Type = Colorized
Color = P3Dark
-
[PartyWinStaticTeam3Deco]
Tex = PartyWinDeco3
X = 316
@@ -6079,7 +6022,6 @@ H = 54
Type = Colorized
Color = Bronze
-
[PartyOptions]
Texts = 5
@@ -6271,7 +6213,6 @@ STColor = White
STDColor = GrayDark
-
[PartyPlayer]
Texts = 6
@@ -6311,18 +6252,17 @@ Color = ColorDark
Tex = MainIcon
Type = Transparent
-
[PartyPlayerStatic4]
X = 126
Y = 545
-W =32
-H =30
+W = 32
+H = 30
Tex = ButtonNavi
Color = White
Type = Transparent
[PartyPlayerStatic5]
-X =310
+X = 310
Y = 545
W = 32
H = 30
@@ -6331,7 +6271,7 @@ Color = White
Type = Transparent
[PartyPlayerStatic6]
-X =530
+X = 530
Y = 545
W = 32
H = 30
@@ -6359,9 +6299,8 @@ Size = 30
Align = 0
Text = PARTY_PLAYER_DESC
-
[PartyPlayerText3]
-X =166
+X = 166
Y = 548
Color = Black
Size = 24
@@ -6369,7 +6308,7 @@ Align = 0
Text = SING_LEGEND_NAVIGATE
[PartyPlayerText4]
-X =350
+X = 350
Y = 548
Color = Black
Font = 0
@@ -6378,7 +6317,7 @@ Align = 0
Text = PARTY_PLAYER_ENTER_NAME
[PartyPlayerText5]
-X =570
+X = 570
Y = 548
Color = Black
Font = 0
@@ -6401,7 +6340,6 @@ Fields = 2
Type = Transparent
TypeSBG = Transparent
-
Color = GrayLight
DColor = Gray
TColor = White
@@ -6487,7 +6425,6 @@ STColor = White
STDColor = GrayDark
-
[PartyPlayerTeam1Name]
Tex = PartyTeamButton2
X = 75
@@ -6793,7 +6730,6 @@ Text = Player 12
Color = White
-
[PartyRoundsBackground]
Tex = PartyBG
@@ -6866,7 +6802,6 @@ Size = 30
Align = 0
Text = PARTY_ROUNDS_DESC
-
[PartyRoundsText3]
X = 290
Y = 548
@@ -7077,15 +7012,14 @@ STColor = White
STDColor = GrayDark
-
[SongMenu]
[SongMenuBackground]
-Type=Fade
-;ColR=0
-;ColG=0
-;ColB=0
-Alpha=0.0
+Type = Fade
+;ColR = 0
+;ColG = 0
+;ColB = 0
+Alpha = 0.0
Tex = SongBG
[SongMenuStatic1]
@@ -7098,7 +7032,6 @@ Z = 0.96
Color = White
Type = Transparent
-
[SongMenuStatic2]
X = 536
Y = 151
@@ -7229,11 +7162,11 @@ Z = 0.97
[SongJumpto]
[SongJumptoBackground]
-Type=Fade
-;ColR=0
-;ColG=0
-;ColB=0
-Alpha=0.0
+Type = Fade
+;ColR = 0
+;ColG = 0
+;ColB = 0
+Alpha = 0.0
[SongJumptoStatic1]
Tex = interface_dialog_background
@@ -7314,7 +7247,6 @@ Text = SONG_JUMPTO_HELP
Align = 0
Z = 0.97
-
[StatMain]
Texts = 0
Statics = 0
@@ -7435,7 +7367,7 @@ Color = White
Font = 0
Size = 27
Align = 0
-Text =
+Text =
[StatMainStatic1]
X = 35
@@ -7522,7 +7454,6 @@ Color = GrayLight
Text = STAT_MAIN
Align = 0
-
[StatMainText2]
X = 70
Y = 63
@@ -7646,7 +7577,7 @@ Color = GrayDark
Font = 0
Size = 30
Align = 0
-Text =
+Text =
[StatDetailTextPage]
X = 546
@@ -7655,7 +7586,7 @@ Color = Black
Font = 0
Size = 15
Align = 2
-Text =
+Text =
[StatDetailTextList1]
X = 45
@@ -7679,7 +7610,7 @@ Y = 198
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList4]
X = 45
@@ -7687,7 +7618,7 @@ Y = 236
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList5]
X = 45
@@ -7695,7 +7626,7 @@ Y = 274
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList6]
X = 45
@@ -7703,7 +7634,7 @@ Y = 312
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList7]
X = 45
@@ -7711,7 +7642,7 @@ Y = 350
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList8]
X = 45
@@ -7719,7 +7650,7 @@ Y = 388
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList9]
X = 45
@@ -7727,7 +7658,7 @@ Y = 426
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailTextList10]
X = 45
@@ -7735,7 +7666,7 @@ Y = 464
Color = White
Font = 0
Size = 21
-Text =
+Text =
[StatDetailStatic1]
X = 35
@@ -7841,11 +7772,11 @@ Text = SING_LEGEND_ESC
[CheckPopup]
[CheckPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[CheckPopupStatic1]
Tex = interface_dialog_background
@@ -7923,15 +7854,14 @@ Text = NO
Align = 1
Z = 1
-
[ErrorPopup]
[ErrorPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[ErrorPopupStatic1]
Tex = interface_dialog_background
@@ -8009,4 +7939,4 @@ IndicatorYOffset = 3
X = 80
W = 640
Y = 535
-H = 41
\ No newline at end of file
+H = 41
diff --git a/game/themes/Classic/Star.ini b/game/themes/Classic/Star.ini
index e72bdbec..0bde56c3 100644
--- a/game/themes/Classic/Star.ini
+++ b/game/themes/Classic/Star.ini
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
ButtonSolo = [mainbutton]Solo.png
@@ -34,13 +35,13 @@ ButtonStats = [mainbutton]Stats.png
ButtonOptions = [mainbutton]Options.png
ButtonExit = [mainbutton]Exit.png
Button = [main]button.png
-ButtonF = [main]buttonf.jpg
-MainBar = [main]mainBar.png
-SelectBG = [main]selectbg.png
+ButtonF = [main]buttonf.jpg
+MainBar = [main]mainBar.png
+SelectBG = [main]selectbg.png
usdx_logo = [main]logo.png
-SongsBG = [songs]bg.png
-SongFade = [song]BGFade.jpg
+SongsBG = [songs]bg.png
+SongFade = [song]BGFade.jpg
SongEqualizerBG = [song]EqualizerBG.jpg
Select_ArrowLeft = [interface]select_arrow_left.png
@@ -71,12 +72,10 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
-SongSelection = [song]selection.png
+SongSelection = [song]selection.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -85,10 +84,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -107,6 +106,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -152,37 +153,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
-StatMainBG2 = [stat]mainBG2.png
-StatMainBG3 = [stat]mainBG3.png
+StatMainBG1 = [stat]mainBG1.png
+StatMainBG2 = [stat]mainBG2.png
+StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -193,17 +191,16 @@ ButtonEnter = [button]enter.png
ButtonNavi = [button]navi.png
ButtonEsc = [button]esc.png
Button13 = [button]13.png
-ButtonE = [button]e.png
+ButtonE = [button]e.png
;Leiste1 = [special]bar1.png
:Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -219,18 +216,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Classic/[icon]song_calcmedley.png b/game/themes/Classic/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
Binary files /dev/null and b/game/themes/Classic/[icon]song_calcmedley.png differ
diff --git a/game/themes/Classic/[icon]song_medley.png b/game/themes/Classic/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
Binary files /dev/null and b/game/themes/Classic/[icon]song_medley.png differ
diff --git a/game/themes/Classic/[sing]SongName.png b/game/themes/Classic/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
Binary files /dev/null and b/game/themes/Classic/[sing]SongName.png differ
diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index c0133d25..53b4b6b0 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -422,7 +422,7 @@ Y = 120
W = 325
H = 200
Reflections = 1
-Style=5
+Style = 5
[SongEqualizer]
Visible = 1
@@ -451,6 +451,30 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 22
+[SongMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_medley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
+[SongCalculatedMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_calcmedley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
[SongStatic3]
X = 278
Y = 120
@@ -962,15 +986,14 @@ TexY1 = 0
TexX2 = 1
TexY2 = 1
-
[Sing]
Texts = 1
[SingBackground]
-Type=color
-ColR=1
-ColB=1
-ColG=1
+Type = color
+ColR = 1
+ColB = 1
+ColG = 1
[SingText1]
Text = SING_TIME
@@ -1278,6 +1301,24 @@ Y = 95
W = 100
H = 8
+[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
+
[Score]
Texts = 1
@@ -2533,6 +2574,30 @@ Tex = ScoreLine
Type = Colorized
Color = White
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Z = 0.5
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 13
+
[Options]
Texts = 6
Fade = 2
@@ -2641,8 +2706,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsStatic6]
X = 550
@@ -4661,7 +4726,6 @@ Size = 42
Align = 2
Text = 00000
-
[Top5TextDate1]
X = 760
Y = 190
@@ -4855,8 +4919,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
# Esc button text
[EditText5]
@@ -4867,8 +4931,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_EXIT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[EditTextDescription]
X = 95
@@ -5663,7 +5727,6 @@ Color = P3Light
Reflection = 1
ReflectionSpacing = 2
-
[PartyNewRoundTextRound1]
X = 460
Y = 133
@@ -5952,7 +6015,6 @@ Size = 30
Text = Player 3
Align = 1
-
[PartyScore]
Texts = 5
@@ -6489,7 +6551,6 @@ Color = P1Dark
Reflection = 1
ReflectionSpacing = 2
-
[PartyWinStaticTeam1Deco]
Tex = PartyWinDeco1
X = 91
@@ -6911,7 +6972,6 @@ STColor = White
STDColor = GrayDark
-
[PartyPlayer]
Texts = 6
@@ -7136,7 +7196,6 @@ SBGDColor = P3Light
STColor = White
STDColor = GrayDark
-
[PartyPlayerTeam1Name]
Tex = PartyTeamButton2
X = 45
@@ -7466,7 +7525,6 @@ Text = Player 12
Color = White
-
[PartyRoundsBackground]
Tex = PartyBG
@@ -7755,15 +7813,14 @@ STColor = White
STDColor = GrayDark
-
[SongMenu]
[SongMenuBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[SongMenuStatic1]
Tex = interface_dialog_background
@@ -7907,11 +7964,11 @@ Z = 0.97
[SongJumpto]
[SongJumptoBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.5
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.5
[SongJumptoStatic1]
Tex = interface_dialog_background
@@ -7991,7 +8048,6 @@ Text = SONG_JUMPTO_HELP
Align = 0
Z = 0.97
-
[StatMain]
Texts = 0
Statics = 0
@@ -8545,11 +8601,11 @@ Text = SING_LEGEND_ESC
[CheckPopup]
[CheckPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[CheckPopupStatic1]
Tex = interface_dialog_background
@@ -8629,15 +8685,14 @@ Text = NO
Align = 1
Z = 1
-
[ErrorPopup]
[ErrorPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[ErrorPopupStatic1]
Tex = interface_dialog_background
diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 3ebc04ff..7e31c570 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Blue
-Color=Blue
+Theme = Deluxe
+Name = Blue
+Color = Blue
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -189,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 4502be61..3191daf8 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Fall
-Color=Orange
+Theme = Deluxe
+Name = Fall
+Color = Orange
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -189,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index 8af41f20..a998874a 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Ocean
-Color=Blue
+Theme = Deluxe
+Name = Ocean
+Color = Blue
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -189,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index 06a4dd41..357582c0 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Ribbon
-Color=Any
+Theme = Deluxe
+Name = Ribbon
+Color = Any
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,27 +143,26 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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 # # #
@@ -171,7 +171,6 @@ StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -188,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -207,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index 660a5ec7..4aaebac1 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Summer
-Color=Red
+Theme = Deluxe
+Name = Summer
+Color = Red
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -189,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 71b4dfaa..d738c32f 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Deluxe
-Name=Winter
-Color=Blue
+Theme = Deluxe
+Name = Winter
+Color = Blue
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
Button = [main]button.png
@@ -32,7 +33,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -60,13 +61,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -189,10 +187,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.jpg
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/[icon]song_calcmedley.png b/game/themes/Deluxe/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
Binary files /dev/null and b/game/themes/Deluxe/[icon]song_calcmedley.png differ
diff --git a/game/themes/Deluxe/[icon]song_medley.png b/game/themes/Deluxe/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
Binary files /dev/null and b/game/themes/Deluxe/[icon]song_medley.png differ
diff --git a/game/themes/Deluxe/[sing]SongName.png b/game/themes/Deluxe/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
Binary files /dev/null and b/game/themes/Deluxe/[sing]SongName.png differ
diff --git a/game/themes/Temptation.ini b/game/themes/Temptation.ini
index 663ac299..9206d83f 100755
--- a/game/themes/Temptation.ini
+++ b/game/themes/Temptation.ini
@@ -405,7 +405,7 @@ Y = 170
W = 325
H = 200
Reflections = 1
-Style=5
+Style = 5
[SongEqualizer]
Visible = 1
@@ -434,6 +434,30 @@ Type = Transparent
Reflection = 0
ReflectionSpacing = 1
+[SongMedleyIcon]
+X = 680
+Y = 425
+W = 32
+H = 32
+Z = 0.95
+Color = White
+Tex = icon_song_medley
+Type = Transparent
+Reflection = 0
+ReflectionSpacing = 1
+
+[SongCalculatedMedleyIcon]
+X = 680
+Y = 425
+W = 32
+H = 32
+Z = 0.95
+Color = White
+Tex = icon_song_calcmedley
+Type = Transparent
+Reflection = 0
+ReflectionSpacing = 1
+
[SongStatic3]
X = 247
Y = 158
@@ -951,15 +975,14 @@ TexY1 = 0
TexX2 = 1
TexY2 = 1
-
[Sing]
Texts = 1
[SingBackground]
-Type=color
-ColR=1
-ColB=1
-ColG=1
+Type = color
+ColR = 1
+ColB = 1
+ColG = 1
[SingText1]
Text = SING_TIME
@@ -1267,6 +1290,24 @@ Y = 95
W = 100
H = 8
+[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
+
[Score]
Texts = 1
@@ -2521,6 +2562,27 @@ Tex = ScoreLine
Type = Colorized
Color = White
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = White
+Size = 24
+Reflection = 1
+ReflectionSpacing = 20
+Text = SING_LEGEND_NAVIGATE
+
[Options]
Texts = 6
Fade = 2
@@ -2605,8 +2667,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_NAVIGATE
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsStatic5]
X = 400
@@ -2627,8 +2689,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsStatic6]
X = 550
@@ -2649,8 +2711,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_ESC
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsButtonGame]
X = 95
@@ -4699,7 +4761,6 @@ Size = 42
Align = 2
Text = 00000
-
[Top5TextDate1]
X = 760
Y = 190
@@ -4893,8 +4954,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
# Esc button text
[EditText5]
@@ -4905,8 +4966,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_EXIT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[EditTextDescription]
X = 5
@@ -5733,7 +5794,6 @@ Color = P3Light
Reflection = 1
ReflectionSpacing = 2
-
[PartyNewRoundTextRound1]
X = 460
Y = 133
@@ -6022,7 +6082,6 @@ Size = 30
Text = Player 3
Align = 1
-
[PartyScore]
Texts = 5
@@ -6124,7 +6183,6 @@ Text = PARTY_LEGEND_CONTINUE
Reflection = 1
ReflectionSpacing = 13
-
[PartyScoreStatic5]
Tex = PartyScoreBG1
X = 50
@@ -6365,7 +6423,6 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
-
[PartyWinText1]
X = 55
Y = 28
@@ -6402,8 +6459,7 @@ Size = 24
Align = 0
Text = PARTY_WIN_LEGEND_CONTINUE
Reflection = 1
-ReflectionSpacing =13
-
+ReflectionSpacing = 13
#[PartyWinTextWinner]
#X = 150
@@ -6560,7 +6616,6 @@ Color = P1Dark
Reflection = 1
ReflectionSpacing = 2
-
[PartyWinStaticTeam1Deco]
Tex = PartyWinDeco1
X = 91
@@ -6826,7 +6881,6 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
-
[PartyOptionsStatic5]
X = 380
Y = 544
@@ -6838,7 +6892,6 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
-
[PartyOptionsText1]
X = 55
Y = 28
@@ -6877,7 +6930,6 @@ Text = SING_LEGEND_NAVIGATE
Reflection = 1
ReflectionSpacing = 13
-
[PartyOptionsText5]
X = 410
Y = 548
@@ -6889,7 +6941,6 @@ Text = SING_LEGEND_CONTINUE
Reflection = 1
ReflectionSpacing = 13
-
[PartyOptionsSelectLevel]
Tex = MainBar
Type = Transparent
@@ -6988,7 +7039,6 @@ STColor = White
STDColor = GrayDark
-
[PartyPlayer]
Texts = 6
@@ -7052,7 +7102,6 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
-
[PartyPlayerStatic6]
X = 548
Y = 544
@@ -7103,7 +7152,6 @@ Text = SING_LEGEND_NAVIGATE
Reflection = 1
ReflectionSpacing = 13
-
[PartyPlayerText5]
X = 410
Y = 548
@@ -7222,7 +7270,6 @@ SBGDColor = P3Dark
STColor = White
STDColor = GrayDark
-
[PartyPlayerTeam1Name]
Tex = PartyTeamButton2
X = 78
@@ -7552,7 +7599,6 @@ Text = Player 12
Color = White
-
[PartyRoundsBackground]
Tex = PartyBG
@@ -7598,7 +7644,6 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 2
-
[PartyRoundsStatic5]
X = 380
Y = 544
@@ -7844,7 +7889,6 @@ STColor = White
STDColor = GrayDark
-
[SongMenu]
[SongMenuBackground]
@@ -8080,7 +8124,6 @@ Text = SONG_JUMPTO_HELP
Align = 0
Z = 0.97
-
[StatMain]
Texts = 0
Statics = 0
@@ -8724,7 +8767,6 @@ Text = NO
Align = 1
Z = 1
-
[ErrorPopup]
[ErrorPopupBackground]
diff --git a/game/themes/Temptation/Temptation (16-9).ini b/game/themes/Temptation/Temptation (16-9).ini
index 0567b074..b30d145b 100755
--- a/game/themes/Temptation/Temptation (16-9).ini
+++ b/game/themes/Temptation/Temptation (16-9).ini
@@ -4,9 +4,9 @@
;don't be suprised it doesn't work good with newer releases
[Skin]
-Theme=Temptation
-Name=Temptation (16-9)
-Color=Green
+Theme = Temptation
+Name = Temptation (16-9)
+Color = Green
[Textures]
/**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
ButtonSolo = [main]buttonsolo.png
@@ -39,7 +40,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -68,13 +69,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -83,10 +82,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -105,6 +104,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -150,43 +151,42 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+PartyScoreBG2 = [party]scoreBG2.png
+PartyWinDeco1 = [party]winDecoration.png
+PartyWinDeco2 = [party]winDecoration.png
+PartyWinDeco3 = [party]winDecoration.png
PartyPlayerSelectBG = [party]playerselectbg.png
# # # O P T I O N S # # #
-Optionsbuttongame = [Options]buttongame.png
+Optionsbuttongame = [Options]buttongame.png
Optionsbuttongraphics = [Options]buttongraphics.png
-Optionsbuttonsound = [Options]buttonsound.png
-Optionsbuttonlyrics = [Options]buttonlyrics.png
-Optionsbuttondesign = [Options]buttondesign.png
-Optionsbuttonrecord = [Options]buttonrecord.png
+Optionsbuttonsound = [Options]buttonsound.png
+Optionsbuttonlyrics = [Options]buttonlyrics.png
+Optionsbuttondesign = [Options]buttondesign.png
+Optionsbuttonrecord = [Options]buttonrecord.png
Optionsbuttonadvanced = [Options]buttonadvanced.png
-Optionsbuttonback = [Options]buttonback.png
+Optionsbuttonback = [Options]buttonback.png
# # # L E V E L # # #
-Levelbuttoneasy = [Level]buttoneasy.png
+Levelbuttoneasy = [Level]buttoneasy.png
Levelbuttonmedium = [Level]buttonmedium.png
-Levelbuttonhard = [Level]buttonhard.png
+Levelbuttonhard = [Level]buttonhard.png
# # # E D I T # # #
Editbuttonconvert = [edit]buttonconvert.png
@@ -194,14 +194,12 @@ Editbuttonconvert = [edit]buttonconvert.png
# # # N A M E # # #
Namebutton = [Name]button.png
-
# # # S T A T S # # #
-StatMainBG1 = [stat]mainBG1.png
-StatMainBG2 = [stat]mainBG2.png
-StatMainBG3 = [stat]mainBG3.png
+StatMainBG1 = [stat]mainBG1.png
+StatMainBG2 = [stat]mainBG2.png
+StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -218,10 +216,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -237,18 +234,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Temptation/Temptation (4-3).ini b/game/themes/Temptation/Temptation (4-3).ini
index a0f72731..87a7f120 100755
--- a/game/themes/Temptation/Temptation (4-3).ini
+++ b/game/themes/Temptation/Temptation (4-3).ini
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
ButtonSolo = [main]buttonsolo.png
@@ -39,7 +40,7 @@ ButtonF = [main]buttonf.jpg
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
#Backgrounds
@@ -68,13 +69,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -83,10 +82,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -105,6 +104,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -150,43 +151,42 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+PartyScoreBG2 = [party]scoreBG2.png
+PartyWinDeco1 = [party]winDecoration.png
+PartyWinDeco2 = [party]winDecoration.png
+PartyWinDeco3 = [party]winDecoration.png
PartyPlayerSelectBG = [party]playerselectbg.png
# # # O P T I O N S # # #
-Optionsbuttongame = [Options]buttongame.png
+Optionsbuttongame = [Options]buttongame.png
Optionsbuttongraphics = [Options]buttongraphics.png
-Optionsbuttonsound = [Options]buttonsound.png
-Optionsbuttonlyrics = [Options]buttonlyrics.png
-Optionsbuttondesign = [Options]buttondesign.png
-Optionsbuttonrecord = [Options]buttonrecord.png
+Optionsbuttonsound = [Options]buttonsound.png
+Optionsbuttonlyrics = [Options]buttonlyrics.png
+Optionsbuttondesign = [Options]buttondesign.png
+Optionsbuttonrecord = [Options]buttonrecord.png
Optionsbuttonadvanced = [Options]buttonadvanced.png
-Optionsbuttonback = [Options]buttonback.png
+Optionsbuttonback = [Options]buttonback.png
# # # L E V E L # # #
-Levelbuttoneasy = [Level]buttoneasy.png
+Levelbuttoneasy = [Level]buttoneasy.png
Levelbuttonmedium = [Level]buttonmedium.png
-Levelbuttonhard = [Level]buttonhard.png
+Levelbuttonhard = [Level]buttonhard.png
# # # E D I T # # #
Editbuttonconvert = [edit]buttonconvert.png
@@ -194,14 +194,12 @@ Editbuttonconvert = [edit]buttonconvert.png
# # # N A M E # # #
Namebutton = [Name]button.png
-
# # # S T A T S # # #
-StatMainBG1 = [stat]mainBG1.png
-StatMainBG2 = [stat]mainBG2.png
-StatMainBG3 = [stat]mainBG3.png
+StatMainBG1 = [stat]mainBG1.png
+StatMainBG2 = [stat]mainBG2.png
+StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -218,10 +216,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -237,18 +234,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Temptation/[icon]song_calcmedley.png b/game/themes/Temptation/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
Binary files /dev/null and b/game/themes/Temptation/[icon]song_calcmedley.png differ
diff --git a/game/themes/Temptation/[icon]song_medley.png b/game/themes/Temptation/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
Binary files /dev/null and b/game/themes/Temptation/[icon]song_medley.png differ
diff --git a/game/themes/Temptation/[sing]SongName.png b/game/themes/Temptation/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
Binary files /dev/null and b/game/themes/Temptation/[sing]SongName.png differ
diff --git a/game/themes/Verdure.ini b/game/themes/Verdure.ini
index 126e0134..c4a5232f 100644
--- a/game/themes/Verdure.ini
+++ b/game/themes/Verdure.ini
@@ -229,7 +229,6 @@ ReflectionSpacing = 15
;FadeTex = ButtonFade
;FadeTexPos = 0
-
[MainButtonSoloText1]
X = 75
Y = 10
@@ -447,7 +446,7 @@ Y = 120
W = 325
H = 200
Reflections = 1
-Style=5
+Style = 5
[SongEqualizer]
Visible = 1
@@ -476,8 +475,32 @@ Type = Transparent
Reflection = 1
ReflectionSpacing = 22
-:[SongStatic3]
-:X = 278
+[SongMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_medley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
+[SongCalculatedMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_calcmedley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
+;[SongStatic3]
+;X = 278
;Y = 120
;W = 244
;H = 200
@@ -1004,15 +1027,14 @@ TexY1 = 0
TexX2 = 1
TexY2 = 1
-
[Sing]
Texts = 1
[SingBackground]
-Type=color
-ColR=1
-ColB=1
-ColG=1
+Type = color
+ColR = 1
+ColB = 1
+ColG = 1
[SingText1]
Text = SING_TIME
@@ -1320,6 +1342,24 @@ Y = 95
W = 100
H = 8
+[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
+
[Score]
Texts = 1
@@ -2595,6 +2635,30 @@ Tex = ScoreLine
Type = Colorized
Color = Black
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Z = 0.5
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 13
+
##################
#################################
#################
@@ -2692,8 +2756,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_NAVIGATE
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsStatic5]
X = 400
@@ -2714,8 +2778,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsStatic6]
X = 550
@@ -2736,8 +2800,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_LEGEND_ESC
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[OptionsButtonGame]
X = 95
@@ -3261,7 +3325,6 @@ Color = Black
Size = 30
Text = SING_OPTIONS_GRAPHICS_WHEREAMI
-
[OptionsGraphicsStatic2]
X = 0
Y = 545
@@ -4888,7 +4951,6 @@ Size = 42
Align = 2
Text = 00000
-
[Top5TextDate1]
X = 760
Y = 190
@@ -5082,8 +5144,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
# Esc button text
[EditText5]
@@ -5094,8 +5156,8 @@ Font = 0
Size = 24
Align = 0
Text = SING_EDIT_EXIT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
[EditTextDescription]
X = 95
@@ -5910,7 +5972,6 @@ Color = P3Dark
Reflection = 1
ReflectionSpacing = 2
-
[PartyNewRoundTextRound1]
X = 460
Y = 133
@@ -6199,7 +6260,6 @@ Size = 30
Text = Player 3
Align = 1
-
[PartyScore]
Texts = 5
@@ -6739,7 +6799,6 @@ Color = P1Dark
Reflection = 1
ReflectionSpacing = 2
-
[PartyWinStaticTeam1Deco]
Tex = PartyWinDeco1
X = 91
@@ -7404,7 +7463,6 @@ STColor = White
STDColor = GrayDark
-
[PartyPlayerTeam1Name]
Tex = PartyTeamButton2
X = 45
@@ -7710,7 +7768,6 @@ Text = Player 12
Color = White
-
[PartyRoundsBackground]
Tex = PartyBG
@@ -8012,18 +8069,16 @@ STColor = White
STDColor = GrayDark
-
[SongMenu]
[SongMenuBackground]
-Type=Fade
-;ColR=0
-;ColG=0
-;ColB=0
-Alpha=0.0
+Type = Fade
+;ColR = 0
+;ColG = 0
+;ColB = 0
+Alpha = 0.0
Tex = SongBG
-
[SongMenuStatic1]
Tex = interface_dialog_background
X = 520
@@ -8166,11 +8221,11 @@ Z = 0.97
[SongJumpto]
[SongJumptoBackground]
-Type=Fade
-;ColR=0
-;ColG=0
-;ColB=0
-Alpha=0.0
+Type = Fade
+;ColR = 0
+;ColG = 0
+;ColB = 0
+Alpha = 0.0
Tex = SongBG
[SongJumptoStatic1]
@@ -8819,11 +8874,11 @@ Text = SING_LEGEND_ESC
[CheckPopup]
[CheckPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[CheckPopupStatic1]
Tex = interface_dialog_background
@@ -8903,15 +8958,14 @@ Text = NO
Align = 1
Z = 1
-
[ErrorPopup]
[ErrorPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
[ErrorPopupStatic1]
Tex = interface_dialog_background
diff --git a/game/themes/Verdure/Drippin.ini b/game/themes/Verdure/Drippin.ini
index bda3141f..a65cab12 100644
--- a/game/themes/Verdure/Drippin.ini
+++ b/game/themes/Verdure/Drippin.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Drippin
-Color=Green
+Theme = Verdure
+Name = Drippin
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/Drippin_Low.ini b/game/themes/Verdure/Drippin_Low.ini
index 183e7405..10439162 100644
--- a/game/themes/Verdure/Drippin_Low.ini
+++ b/game/themes/Verdure/Drippin_Low.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Drippin (Low)
-Color=Green
+Theme = Verdure
+Name = Drippin (Low)
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/Drippin_Static.ini b/game/themes/Verdure/Drippin_Static.ini
index c9b0fc10..3ec2373d 100644
--- a/game/themes/Verdure/Drippin_Static.ini
+++ b/game/themes/Verdure/Drippin_Static.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Drippin (Static)
-Color=Green
+Theme = Verdure
+Name = Drippin (Static)
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/Springtime.ini b/game/themes/Verdure/Springtime.ini
index 52e69d18..daa154b0 100644
--- a/game/themes/Verdure/Springtime.ini
+++ b/game/themes/Verdure/Springtime.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Springtime
-Color=Green
+Theme = Verdure
+Name = Springtime
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/Springtime_Low.ini b/game/themes/Verdure/Springtime_Low.ini
index 93e91ac4..41d87200 100644
--- a/game/themes/Verdure/Springtime_Low.ini
+++ b/game/themes/Verdure/Springtime_Low.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Springtime (Low)
-Color=Green
+Theme = Verdure
+Name = Springtime (Low)
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/Springtime_Static.ini b/game/themes/Verdure/Springtime_Static.ini
index 999c1b02..7f0df7e7 100644
--- a/game/themes/Verdure/Springtime_Static.ini
+++ b/game/themes/Verdure/Springtime_Static.ini
@@ -7,9 +7,9 @@
;� Copyright dreamscene.org - All rights reserved.
[Skin]
-Theme=Verdure
-Name=Springtime (Static)
-Color=Green
+Theme = Verdure
+Name = Springtime (Static)
+Color = Green
[Textures]
/**
@@ -17,7 +17,7 @@ Color=Green
*/
interface_selectbg_search = [interface]selectbg_search.png
interface_dialog_background = [interface]dialog_background.png
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft = [interface]select_arrow_left.png
Select_ArrowRight = [interface]select_arrow_right.png
Cursor = [interface]cursor.png
@@ -29,7 +29,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
icon_song_menu = [icon]song_menu.png
icon_song_search = [icon]song_search.png
icon_song_video = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
# # # M A I N # # #
LoadLogo = [main]logo.png
@@ -66,13 +67,11 @@ VideoIcon = [icon]video.png
IconError = [icon]error.png
IconQuestion = [icon]question.png
-
# # # S O N G S E L E C E T # # #
SongSelection1 = [main]songSelection1.png
SongSelection2 = [main]songSelection2.png
SongCover = [main]songCover.jpg
-
# # # S I N G # # #
#the bar where the lyrics reside
LyricBar = [sing]textBar.png
@@ -81,10 +80,10 @@ LyricBar = [sing]textBar.png
LyricHelpBar = [sing]lyricsHelpBar.png
#the bar behind the timestuff
-TimeBar1 = [sing]timeBarBG.png
+TimeBar1 = [sing]timeBarBG.png
#the time progress bar (not skinned in this theme :P )
-TimeBar = [sing]timeBar.jpg
+TimeBar = [sing]timeBar.jpg
#linebonus, the thing that pop ups at the score
LineBonusBack = [sing]lineBonusPopUp.png
@@ -103,6 +102,8 @@ P = [sing]p.png
#Pointer for lyrics
Ball = [sing]LyricsBall.png
+#Song name for medley mode
+SongName = [sing]SongName.png
# # # S C O R E / T O P 5 # # #
ScoreBox = [score]box.png
@@ -148,37 +149,34 @@ Rating_6 = [score]rating_6.png
Rating_7 = [score]rating_7.png
# thank you girls and guys!!!
-
# # # P A R T Y # # #
-Joker =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1 =[party]roundTeamButton.png
-PartyTeamButton2 =[party]playerTeamButton.png
-PartyTeamButton3 =[party]winTeamButton1.png
-PartyTeamButton4 =[party]winTeamButton2.png
-PartyTeamButton5 =[party]winTeamButton3.png
-PartyRoundBG1 =[party]roundBG1.png
-PartyRoundBG2 =[party]roundBG2.png
-PartyRoundBG3 =[party]roundBG3.png
-PartyRoundBG4 =[party]roundBG4.png
-HDL_Pointer =[party]pointer.png
-PartyTeamPoints =[party]teamPoints.png
-PartyScoreDeco =[party]scoreDecoration.png
-PartyScoreBG1 =[party]scoreBG1.png
-PartyScoreBG2 =[party]scoreBG2.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
+PartyTeamButton3 = [party]winTeamButton1.png
+PartyTeamButton4 = [party]winTeamButton2.png
+PartyTeamButton5 = [party]winTeamButton3.png
+PartyRoundBG1 = [party]roundBG1.png
+PartyRoundBG2 = [party]roundBG2.png
+PartyRoundBG3 = [party]roundBG3.png
+PartyRoundBG4 = [party]roundBG4.png
+HDL_Pointer = [party]pointer.png
+PartyTeamPoints = [party]teamPoints.png
+PartyScoreDeco = [party]scoreDecoration.png
+PartyScoreBG1 = [party]scoreBG1.png
+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
StatMainBG2 = [stat]mainBG2.png
StatMainBG3 = [stat]mainBG3.png
StatDetailBG1 = [stat]detailBG1.png
-
# # # N A V I # # #
ButtonP = [button]p.png
ButtonM = [button]m.png
@@ -195,10 +193,9 @@ Leiste2 = [special]bar2.png
JumpToBG = [menu]jumpToBg.png
SongMenuBG = [menu]songMenuBg.png
-SongMenuSelectBG = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
PopUpBG = [menu]popUpBG.png
-
# # # N O T E S # # #
# sung notes - colorized with playercolors
GrayLeft = [sing]notesLeft.png
@@ -214,18 +211,15 @@ NoteBGMid = [sing]notesBgMid.png
NoteBGRight = [sing]notesBgRight.png
Pause = [sing]pause.png
-
# # # E F F E C T S # # #
NoteStar = [effect]goldenNoteStar.png
NotePerfectStar = [effect]perfectNoteStar.png
-
# # # dirty helpers # # #
Rectangle = [helper]rectangle.png
ButtonFade = [helper]buttonFade.png
BGFade = [special]bg_fade.png
-
# # # D U E T # # #
LyricIcon_P1 = [sing.player1]lyric_active.png
LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Verdure/[icon]song_calcmedley.png b/game/themes/Verdure/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
Binary files /dev/null and b/game/themes/Verdure/[icon]song_calcmedley.png differ
diff --git a/game/themes/Verdure/[icon]song_medley.png b/game/themes/Verdure/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
Binary files /dev/null and b/game/themes/Verdure/[icon]song_medley.png differ
diff --git a/game/themes/Verdure/[sing]SongName.png b/game/themes/Verdure/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
Binary files /dev/null and b/game/themes/Verdure/[sing]SongName.png differ
diff --git a/src/base/TextGL.pas b/src/base/TextGL.pas
index feca0974..7da1d558 100644
--- a/src/base/TextGL.pas
+++ b/src/base/TextGL.pas
@@ -56,6 +56,7 @@ const
ftBold = 1;
ftOutline1 = 2;
ftOutline2 = 3;
+ ftBoldHighRes = 4;
var
Fonts: array of TGLFont;
@@ -98,7 +99,7 @@ procedure AddFontFallbacks(FontIni: TMemIniFile; Font: TFont);
var
FallbackFont: IPath;
IdentName: string;
- I: Integer;
+ I: integer;
begin
// evaluate the ini-file's 'Fallbacks' section
for I := 1 to 10 do
@@ -117,8 +118,8 @@ begin
end;
const
- FONT_NAMES: array [0..3] of string = (
- 'Normal', 'Bold', 'Outline1', 'Outline2'
+ FONT_NAMES: array [0..4] of string = (
+ 'Normal', 'Bold', 'Outline1', 'Outline2', 'BoldHighRes'
);
procedure BuildFonts;
@@ -126,6 +127,8 @@ var
I: integer;
FontIni: TMemIniFile;
FontFile: IPath;
+ FontMaxResolution: integer;
+ FontPreCache: integer;
Outline: single;
Embolden: single;
OutlineFont: TFTScalableOutlineFont;
@@ -144,12 +147,21 @@ begin
FontFile := FindFontFile(FontIni.ReadString(SectionName , 'File', ''));
+ FontMaxResolution := FontIni.ReadInteger(SectionName, 'MaxResolution', 64);
+ FontPreCache := FontIni.ReadInteger(SectionName, 'PreCache', 1);
+
// create either outlined or normal font
Outline := FontIni.ReadFloat(SectionName, 'Outline', 0.0);
if (Outline > 0.0) then
begin
// outlined font
- OutlineFont := TFTScalableOutlineFont.Create(FontFile, 64, Outline, True, True);
+ OutlineFont := TFTScalableOutlineFont.Create(
+ FontFile,
+ FontMaxResolution,
+ Outline,
+ True,
+ (FontPreCache <> 0)
+ );
OutlineFont.SetOutlineColor(
FontIni.ReadFloat(SectionName, 'OutlineColorR', 0.0),
FontIni.ReadFloat(SectionName, 'OutlineColorG', 0.0),
@@ -163,7 +175,13 @@ begin
begin
// normal font
Embolden := FontIni.ReadFloat(SectionName, 'Embolden', 0.0);
- Fonts[I].Font := TFTScalableFont.Create(FontFile, 64, Embolden, True, True);
+ Fonts[I].Font := TFTScalableFont.Create(
+ FontFile,
+ FontMaxResolution,
+ Embolden,
+ True,
+ (FontPreCache <> 0)
+ );
Fonts[I].Outlined := false;
end;
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index b385406f..7dd30f7f 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -34,12 +34,12 @@ interface
{$I switches.inc}
uses
- IniFiles,
SysUtils,
Classes,
+ IniFiles,
ULog,
- UTexture,
- UPath;
+ UPath,
+ UTexture;
type
TRGB = record
@@ -261,6 +261,10 @@ type
//Video Icon Mod
VideoIcon: TThemeStatic;
+ //Medley Icons
+ MedleyIcon: TThemeStatic;
+ CalculatedMedleyIcon: TThemeStatic;
+
//Show Cat in TopLeft Mod
TextCat: TThemeText;
StaticCat: TThemeStatic;
@@ -356,6 +360,9 @@ type
TextP3R: TThemeText;
TextP3RScore: TThemeText;
+ StaticSongName: TThemeStatic;
+ TextSongName: TThemeText;
+
//Linebonus Translations
LineBonusText: array [0..8] of UTF8String;
@@ -401,6 +408,9 @@ type
StaticLevelRound: array[1..6] of TThemeStatic;
StaticPlayerIdBox: array[1..6] of TThemeStatic;
+ StaticNavigate: TThemeStatic;
+ TextNavigate: TThemeText;
+
// Description: array[0..5] of string;}
end;
@@ -1087,6 +1097,10 @@ begin
//Video Icon Mod
ThemeLoadStatic(Song.VideoIcon, 'SongVideoIcon');
+ //Medley Icons
+ ThemeLoadStatic(Song.MedleyIcon, 'SongMedleyIcon');
+ ThemeLoadStatic(Song.CalculatedMedleyIcon, 'SongCalculatedMedleyIcon');
+
//Show Cat in TopLeft Mod
ThemeLoadStatic(Song.StaticCat, 'SongStaticCat');
ThemeLoadText(Song.TextCat, 'SongTextCat');
@@ -1210,6 +1224,9 @@ begin
ThemeLoadStatic(Sing.StaticP3RScoreBG, 'SingP3RStatic2');
ThemeLoadText(Sing.TextP3RScore, 'SingP3RTextScore');
+ ThemeLoadStatic(Sing.StaticSongName, 'SingSongNameStatic');
+ ThemeLoadText(Sing.TextSongName, 'SingSongNameText');
+
//Line Bonus Texts
Sing.LineBonusText[0] := Language.Translate('POPUP_AWFUL');
Sing.LineBonusText[1] := Sing.LineBonusText[0];
@@ -1260,6 +1277,9 @@ begin
ThemeLoadStatic(Score.StaticRatings[I], 'ScoreStaticRatingPicture' + IntToStr(I));
end;
+ ThemeLoadStatic(Score.StaticNavigate, 'ScoreStaticNavigate');
+ ThemeLoadText(Score.TextNavigate, 'ScoreTextNavigate');
+
// Top5
ThemeLoadBasic(Top5, 'Top5');
diff --git a/src/screens/UScreenScore.pas b/src/screens/UScreenScore.pas
index 4b7332b4..82b73ea2 100644
--- a/src/screens/UScreenScore.pas
+++ b/src/screens/UScreenScore.pas
@@ -168,6 +168,8 @@ type
TextGolden_ActualValue: array[1..6] of integer;
ActualRound: integer;
+ StaticNavigate: integer;
+ TextNavigate: integer;
procedure RefreshTexts;
procedure ResetScores;
@@ -577,6 +579,9 @@ begin
aPlayerScoreScreenTextures[Player].Player_Id_Box := Texture.GetTexture(Skin.GetTextureFileName('PlayerIDBox0' + IntToStr(Player)), Texture_Type_Transparent);
end;
+ StaticNavigate := AddStatic(Theme.Score.StaticNavigate);
+ TextNavigate := AddText(Theme.Score.TextNavigate);
+
LoadSwapTextures;
end;
@@ -701,6 +706,14 @@ begin
begin
for P := 0 to PlayersPlay - 1 do
Player[P] := PlaylistMedley.Stats[ActualRound].Player[P];
+
+ Statics[StaticNavigate].Visible := true;
+ Text[TextNavigate].Visible := true;
+ end
+ else
+ begin
+ Statics[StaticNavigate].Visible := false;
+ Text[TextNavigate].Visible := false;
end;
MapPlayersToPosition;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index 13350511..581e22a0 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -123,6 +123,9 @@ type
StaticPausePopup: integer;
+ SongNameStatic: integer;
+ SongNameText: integer;
+
Tex_Background: TTexture;
FadeOut: boolean;
Lyrics: TLyricEngine;
@@ -142,6 +145,7 @@ type
PlayerEnabled: integer; //< defines whether a player can score atm
end;
+
procedure ClearSettings;
procedure ApplySettings; //< applies changes of settings record
procedure EndSong;
@@ -370,6 +374,9 @@ begin
fLyricsSync := TLyricsSyncSource.Create();
fMusicSync := TMusicSyncSource.Create();
+ SongNameStatic := AddStatic(Theme.Sing.StaticSongName);;
+ SongNameText := AddText(Theme.Sing.TextSongName);
+
eSongLoaded := THookableEvent.Create('ScreenSing.SongLoaded');
ClearSettings;
@@ -412,8 +419,8 @@ begin
else
fTimebarMode := tbmCurrent;
- // prepare players
- SetLength(Player, PlayersPlay);
+ Statics[SongNameStatic].Visible := false;
+ Text[SongNameText].Visible := false;
case PlayersPlay of
1:
@@ -768,11 +775,10 @@ begin
begin
CurrentSong.SetMedleyMode();
-{ ** ToDo
Text[SongNameText].Text := IntToStr(PlaylistMedley.CurrentMedleySong) +
'/' + IntToStr(PlaylistMedley.NumMedleySongs) + ': ' +
CurrentSong.Artist + ' - ' + CurrentSong.Title;
-}
+
//medley start and end timestamps
StartNote := FindNote(CurrentSong.Medley.StartBeat - round(CurrentSong.BPM[0].BPM*CurrentSong.Medley.FadeIn_time / 60));
MedleyStart := GetTimeFromBeat(Lines[0].Line[StartNote.line].Note[0].Start);
@@ -1452,13 +1458,16 @@ var
begin
if AudioPlayback.Position < GetTimeFromBeat(CurrentSong.Medley.StartBeat) then
begin
- timeDiff := GetTimeFromBeat(CurrentSong.Medley.StartBeat)-AudioPlayback.Position+1;
+ Statics[SongNameStatic].Visible := true;
+ Text[SongNameText].Visible := true;
+
+ timeDiff := GetTimeFromBeat(CurrentSong.Medley.StartBeat) - AudioPlayback.Position + 1;
t := frac(timeDiff);
glColor4f(0.15, 0.30, 0.6, t);
h := 300 * t * ScreenH / RenderH;
- SetFontStyle(ftBold);
+ SetFontStyle(ftBoldHighRes);
SetFontItalic(false);
SetFontSize(h);
CountDownText := IntToStr(round(timeDiff - t));
@@ -1466,7 +1475,13 @@ begin
SetFontPos (RenderW / 2 - w / 2, RenderH / 2 - h / 2);
glPrint(PChar(CountDownText));
+ end
+ else
+ begin
+ Statics[SongNameStatic].Visible := false;
+ Text[SongNameText].Visible := false;
end;
end;
+end;
end.
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 7558a59b..50efd792 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -78,6 +78,10 @@ type
//Video Icon Mod
VideoIcon: cardinal;
+ //Medley Icons
+ MedleyIcon: cardinal;
+ CalcMedleyIcon: cardinal;
+
TextCat: integer;
StaticCat: integer;
@@ -425,13 +429,6 @@ begin
Ord('S'):
begin
- Log.LogError('SDL_ModState: ' + inttostr(SDL_ModState));
- Log.LogError('KMOD_LSHIFT: ' + inttostr(KMOD_LSHIFT));
- Log.LogError('CatSongs.Song[Interaction].Medley.Source: ' + inttostr(ord(CatSongs.Song[Interaction].Medley.Source)));
- Log.LogError('msCalculated: ' + inttostr(ord(msCalculated)));
- Log.LogError('msTag: ' + inttostr(ord(msTag)));
- Log.LogError('Mode: ' + inttostr(ord(Mode)));
- Log.LogError('smNormal: ' + inttostr(ord(smNormal)));
if //(SDL_ModState = KMOD_LSHIFT) and
(CatSongs.Song[Interaction].Medley.Source >= msCalculated) and (Mode = smNormal) then
StartMedley(0, msCalculated)
@@ -441,14 +438,6 @@ begin
Ord('D'):
begin
- Log.LogError('SDL_ModState: ' + inttostr(SDL_ModState));
- Log.LogError('KMOD_LSHIFT: ' + inttostr(KMOD_LSHIFT));
- Log.LogError('length(getVisibleMedleyArr(msCalculated)): ' + inttostr(length(getVisibleMedleyArr(msCalculated))));
- Log.LogError('msCalculated: ' + inttostr(ord(msCalculated)));
- Log.LogError('msTag: ' + inttostr(ord(msTag)));
- Log.LogError('Length(getVisibleMedleyArr(msTag)): ' + inttostr(Length(getVisibleMedleyArr(msTag))));
- Log.LogError('smNormal: ' + inttostr(ord(smNormal)));
- Log.LogError('Mode: ' + inttostr(ord(Mode)));
if (Mode = smNormal) and //(SDL_ModState = KMOD_LSHIFT) and
(length(getVisibleMedleyArr(msCalculated)) > 0) then
StartMedley(5, msCalculated)
@@ -881,6 +870,10 @@ begin
//Show Video Icon Mod
VideoIcon := AddStatic(Theme.Song.VideoIcon);
+ //Medley Icons
+ MedleyIcon := AddStatic(Theme.Song.MedleyIcon);
+ CalcMedleyIcon := AddStatic(Theme.Song.CalculatedMedleyIcon);
+
//Party Mode
StaticTeam1Joker1 := AddStatic(Theme.Song.StaticTeam1Joker1);
StaticTeam1Joker2 := AddStatic(Theme.Song.StaticTeam1Joker2);
@@ -1042,6 +1035,10 @@ begin
// Set visibility of video icon
Statics[VideoIcon].Visible := CatSongs.Song[Interaction].Video.IsSet;
+ // Set visibility of medley icons
+ Statics[MedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msTag);
+ Statics[CalcMedleyIcon].Visible := (CatSongs.Song[Interaction].Medley.Source = msCalculated);
+
// Set texts
Text[TextArtist].Text := CatSongs.Song[Interaction].Artist;
Text[TextTitle].Text := CatSongs.Song[Interaction].Title;
--
cgit v1.2.3