Some Themework done.

Added new Statics to PartyWin. [PartyWinStaticTeam(n)BG and Deco]
Fix: bug in PartyScore (esc skipped to PartyNewRound where PartyWin should come)
Disabled Esc in PartyWin. 
To do: Sing-Screen, Stats

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

13 files changed, 227 insertions, 73 deletions

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index ea2328f9..e8f8eb10 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -579,8 +579,14 @@ type
     TextNameTeam2:     TThemeText;

     TextNameTeam3:     TThemeText;

     StaticTeam1:       TThemeStatic;

+    StaticTeam1BG:     TThemeStatic;

+    StaticTeam1Deco:   TThemeStatic;

     StaticTeam2:       TThemeStatic;

+    StaticTeam2BG:     TThemeStatic;

+    StaticTeam2Deco:   TThemeStatic;

     StaticTeam3:       TThemeStatic;

+    StaticTeam3BG:     TThemeStatic;

+    StaticTeam3Deco:   TThemeStatic;

 

     TextWinner:        TThemeText;

   end;

@@ -1308,8 +1314,14 @@ begin
       ThemeLoadText (PartyWin.TextNameTeam3, 'PartyWinTextNameTeam3');

 

       ThemeLoadStatic (PartyWin.StaticTeam1, 'PartyWinStaticTeam1');

+      ThemeLoadStatic (PartyWin.StaticTeam1BG, 'PartyWinStaticTeam1BG');

+      ThemeLoadStatic (PartyWin.StaticTeam1Deco, 'PartyWinStaticTeam1Deco');

       ThemeLoadStatic (PartyWin.StaticTeam2, 'PartyWinStaticTeam2');

+      ThemeLoadStatic (PartyWin.StaticTeam2BG, 'PartyWinStaticTeam2BG');

+      ThemeLoadStatic (PartyWin.StaticTeam2Deco, 'PartyWinStaticTeam2Deco');

       ThemeLoadStatic (PartyWin.StaticTeam3, 'PartyWinStaticTeam3');

+      ThemeLoadStatic (PartyWin.StaticTeam3BG, 'PartyWinStaticTeam3BG');

+      ThemeLoadStatic (PartyWin.StaticTeam3Deco, 'PartyWinStaticTeam3Deco');

 

       ThemeLoadText (PartyWin.TextWinner, 'PartyWinTextWinner');

 

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 4afaee09..324656c0 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -51,7 +51,7 @@ begin
       SDLK_ESCAPE :

         begin

           Music.PlayStart;

-          if (PartySession.CurRound <= High(PartySession.Rounds)) then

+          if (PartySession.CurRound < High(PartySession.Rounds)) then

             FadeTo(@ScreenPartyNewRound)

           else

           begin

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index ff65e82f..a6486f67 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -15,10 +15,16 @@ type
       TextNameTeam2:     Cardinal;

       TextNameTeam3:     Cardinal;

       StaticTeam1:       Cardinal;

+      StaticTeam1BG:     Cardinal;

+      StaticTeam1Deco:   Cardinal;

       StaticTeam2:       Cardinal;

+      StaticTeam2BG:     Cardinal;

+      StaticTeam2Deco:   Cardinal;

       StaticTeam3:       Cardinal;

+      StaticTeam3BG:     Cardinal;

+      StaticTeam3Deco:   Cardinal;

       TextWinner:        Cardinal;

-      

+

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

@@ -40,11 +46,11 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      {SDLK_ESCAPE :

         begin

           Music.PlayStart;

           FadeTo(@ScreenMain);

-        end;

+        end;}

 

       SDLK_RETURN:

         begin

@@ -69,8 +75,14 @@ begin
   TextNameTeam3 := AddText (Theme.PartyWin.TextNameTeam3);

 

   StaticTeam1 := AddStatic (Theme.PartyWin.StaticTeam1);

+  StaticTeam1BG := AddStatic (Theme.PartyWin.StaticTeam1BG);

+  StaticTeam1Deco := AddStatic (Theme.PartyWin.StaticTeam1Deco);

   StaticTeam2 := AddStatic (Theme.PartyWin.StaticTeam2);

+  StaticTeam2BG := AddStatic (Theme.PartyWin.StaticTeam2BG);

+  StaticTeam2Deco := AddStatic (Theme.PartyWin.StaticTeam2Deco);

   StaticTeam3 := AddStatic (Theme.PartyWin.StaticTeam3);

+  StaticTeam3BG := AddStatic (Theme.PartyWin.StaticTeam3BG);

+  StaticTeam3Deco := AddStatic (Theme.PartyWin.StaticTeam3Deco);

 

   TextWinner := AddText (Theme.PartyWin.TextWinner);

 

@@ -93,12 +105,16 @@ begin
     Text[TextScoreTeam1].Visible := True;

     Text[TextNameTeam1].Visible := True;

     Static[StaticTeam1].Visible := True;

+    Static[StaticTeam1BG].Visible := True;

+    Static[StaticTeam1Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam1].Visible := False;

     Text[TextNameTeam1].Visible := False;

     Static[StaticTeam1].Visible := False;

+    Static[StaticTeam1BG].Visible := False;

+    Static[StaticTeam1Deco].Visible := False;

   end;

 

   if (PartySession.Teams.NumTeams >= 2) then

@@ -109,12 +125,16 @@ begin
     Text[TextScoreTeam2].Visible := True;

     Text[TextNameTeam2].Visible := True;

     Static[StaticTeam2].Visible := True;

+    Static[StaticTeam2BG].Visible := True;

+    Static[StaticTeam2Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam2].Visible := False;

     Text[TextNameTeam2].Visible := False;

     Static[StaticTeam2].Visible := False;

+    Static[StaticTeam2BG].Visible := False;

+    Static[StaticTeam2Deco].Visible := False;

   end;

 

   if (PartySession.Teams.NumTeams >= 3) then

@@ -125,12 +145,16 @@ begin
     Text[TextScoreTeam3].Visible := True;

     Text[TextNameTeam3].Visible := True;

     Static[StaticTeam3].Visible := True;

+    Static[StaticTeam3BG].Visible := True;

+    Static[StaticTeam3Deco].Visible := True;

   end

   else

   begin

     Text[TextScoreTeam3].Visible := False;

     Text[TextNameTeam3].Visible := False;

     Static[StaticTeam3].Visible := False;

+    Static[StaticTeam3BG].Visible := False;

+    Static[StaticTeam3Deco].Visible := False;

   end;

 

 

diff --git a/Languages/readme.txt b/Languages/readme.txt
index 52f3f966..82c5bfb2 100644
--- a/Languages/readme.txt
+++ b/Languages/readme.txt
@@ -97,30 +97,50 @@ SONG_JUMPTO_HELP=Type Text to Search for
 SONG_JUMPTO_CATTEXT=Search for: %s

 

 #Texts for Party Mode

-PARTY_SCORE_WINS=%s wins!

-PARTY_OPTIONS_DESC=Party Mode

+PARTY_MODE=party mode

 PARTY_DIFFICULTY=Difficulty

 PARTY_PLAYLIST=Playlist Mode

+PARTY_PLAYLIST_ALL=All songs

+PARTY_PLAYLIST_CATEGORY=Folder

+PARTY_PLAYLIST_PLAYLIST=Playlist

 PARTY_ROUNDS=Rounds

 PARTY_TEAMS=Teams

 PARTY_TEAMS_PLAYER1=Player Team1

 PARTY_TEAMS_PLAYER2=Player Team2

 PARTY_TEAMS_PLAYER3=Player Team3

-PARTY_SELECT_PLAYER=Enter Playernames!

-

+PARTY_LEGEND_CONTINUE=continue

+PARTY_OPTIONS_DESC=settings for the party-game

+PARTY_OPTIONS_WHEREAMI=Party Options

+PARTY_PLAYER_DESC=enter player- and teamnames!

+PARTY_PLAYER_WHEREAMI=Party Names

+PARTY_PLAYER_ENTER_NAME=enter names

+PARTY_PLAYER_LEGEND_CONTINUE=start party-game

+PARTY_ROUND_DESC=next players to the mics

+PARTY_ROUND_WHEREAMI=Party Next Round

+PARTY_ROUND_LEGEND_CONTINUE=start round

+PARTY_SCORE_DESC=score of the last round

+PARTY_SCORE_WHEREAMI=Party Points

+PARTY_WIN_DESC=winner of the party-game

+PARTY_WIN_WHEREAMI=Party Winner

+PARTY_WIN_LEGEND_CONTINUE=back to main-menu

+PARTY_ROUND=Round

+PARTY_ROUND_WINNER=Winner

+PARTY_NOTPLAYEDYET=not played yet

+PARTY_NOBODY=nobody

+NEXT_ROUND=Next round:

 PARTY_DISMISSED=Dismissed!

-PARTY_NOTPLAYEDYET=Not played yet

-PARTY_NOBODY=Nobody

+PARTY_SCORE_WINS=%s 

+PARTY_SCORE_WINS2=wins!

 

 #Texts that descripts Plugins or Modis

 PLUGIN_HDL_NAME=Hold the Line

-PLUGIN_HDL_DESC=Don't get worse than the Pointer at the Rating bar shows you.

+PLUGIN_HDL_DESC=Don't get worse than the pointer at the rating bar shows you.

 PLUGIN_UNTIL5000_NAME=Until 5000

-PLUGIN_UNTIL5000_DESC=Who gets 5000 Points first wins the match

+PLUGIN_UNTIL5000_DESC=Who gets 5000 points first wins the match.

 PLUGIN_DUELL_NAME=Duell

-PLUGIN_DUELL_DESC=Sing a Duell until 10000 Points

+PLUGIN_DUELL_DESC=Sing a duell until 10000 points.

 PLUGIN_BLIND_NAME=Blind Mode

-PLUGIN_BLIND_DESC=Duell without seeing the Notes

+PLUGIN_BLIND_DESC=Duell without seeing the notes.

 

 #Statistics Screen

 #For more Info about the Format Strings look at the SorceCode (UScreenStatMain)

@@ -158,7 +178,7 @@ STAT_DESC_BANDS_REVERSED=Least popular Bands
 STAT_FORMAT_BANDS=%0:s \n %1:dx Sung

 

 #Messages for Popup Message Boxes

-MSG_QUIT_USDX=Leave UltraStar?

-MSG_END_PARTY=End Party Mode?

+MSG_QUIT_USDX=Really leave\n\nUltraStar?

+MSG_END_PARTY=Really end\n\nParty Mode?

 ERROR_NO_SONGS=Error: \n No Songs \n loaded

 ERROR_NO_PLUGINS=Error: \n No Plugins \n loaded
\ No newline at end of file
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index dcbd064b..7e416d4c 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -87,6 +87,9 @@ Joker             =[party]Joker.jpg
 PartyPlayerButton =[party]playerButton.jpg

 PartyTeamButton1  =[party]roundTeamButton.jpg

 PartyTeamButton2  =[party]playerTeamButton.jpg

+PartyTeamButton3  =[party]winTeamButton1.jpg

+PartyTeamButton4  =[party]winTeamButton2.jpg

+PartyTeamButton5  =[party]winTeamButton3.jpg

 PartyRoundBG1     =[party]roundBG1.jpg

 PartyRoundBG2     =[party]roundBG2.jpg

 PartyRoundBG3     =[party]roundBG3.jpg

@@ -96,6 +99,9 @@ PartyTeamPoints   =[party]teamPoints.jpg
 PartyScoreDeco    =x_[party]scoreDecoration.jpg

 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

+PartyWinDeco1     =x_[party]winDecoration1.jpg

+PartyWinDeco2     =x_[party]winDecoration1.jpg

+PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

 StatOverviewBG   = [stat]OverviewBG.jpg

diff --git a/Skins/Deluxe/Summer.ini b/Skins/Deluxe/Summer.ini
index f0aca08e..bc3b711b 100644
--- a/Skins/Deluxe/Summer.ini
+++ b/Skins/Deluxe/Summer.ini
@@ -87,6 +87,9 @@ Joker             =[party]Joker.jpg
 PartyPlayerButton =[party]playerButton.jpg

 PartyTeamButton1  =[party]roundTeamButton.jpg

 PartyTeamButton2  =[party]playerTeamButton.jpg

+PartyTeamButton3  =[party]winTeamButton1.jpg

+PartyTeamButton4  =[party]winTeamButton2.jpg

+PartyTeamButton5  =[party]winTeamButton3.jpg

 PartyRoundBG1     =[party]roundBG1.jpg

 PartyRoundBG2     =[party]roundBG2.jpg

 PartyRoundBG3     =[party]roundBG3.jpg

@@ -96,6 +99,9 @@ PartyTeamPoints   =[party]teamPoints.jpg
 PartyScoreDeco    =x_[party]scoreDecoration.jpg

 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

+PartyWinDeco1     =x_[party]winDecoration1.jpg

+PartyWinDeco2     =x_[party]winDecoration1.jpg

+PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

 StatOverviewBG   = [stat]OverviewBG.jpg

diff --git a/Skins/Deluxe/Winter.ini b/Skins/Deluxe/Winter.ini
index 209ea64f..7d8e247b 100644
--- a/Skins/Deluxe/Winter.ini
+++ b/Skins/Deluxe/Winter.ini
@@ -86,6 +86,9 @@ Joker             =[party]Joker.jpg
 PartyPlayerButton =[party]playerButton.jpg

 PartyTeamButton1  =[party]roundTeamButton.jpg

 PartyTeamButton2  =[party]playerTeamButton.jpg

+PartyTeamButton3  =[party]winTeamButton1.jpg

+PartyTeamButton4  =[party]winTeamButton2.jpg

+PartyTeamButton5  =[party]winTeamButton3.jpg

 PartyRoundBG1     =[party]roundBG1.jpg

 PartyRoundBG2     =[party]roundBG2.jpg

 PartyRoundBG3     =[party]roundBG3.jpg

@@ -95,6 +98,9 @@ PartyTeamPoints   =[party]teamPoints.jpg
 PartyScoreDeco    =x_[party]scoreDecoration.jpg

 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

+PartyWinDeco1     =x_[party]winDecoration1.jpg

+PartyWinDeco2     =x_[party]winDecoration1.jpg

+PartyWinDeco3     =x_[party]winDecoration1.jpg

 

 # # # S T A T S # # #

 StatOverviewBG   = [stat]OverviewBG.jpg

diff --git a/Skins/Deluxe/[party]winTeamButton1.jpg b/Skins/Deluxe/[party]winTeamButton1.jpg
new file mode 100644
index 00000000..10c8d80f
--- /dev/null
+++ b/Skins/Deluxe/[party]winTeamButton1.jpg
diff --git a/Skins/Deluxe/[party]winTeamButton2.jpg b/Skins/Deluxe/[party]winTeamButton2.jpg
new file mode 100644
index 00000000..fbd85056
--- /dev/null
+++ b/Skins/Deluxe/[party]winTeamButton2.jpg
diff --git a/Skins/Deluxe/[party]winTeamButton3.jpg b/Skins/Deluxe/[party]winTeamButton3.jpg
new file mode 100644
index 00000000..e8dd9566
--- /dev/null
+++ b/Skins/Deluxe/[party]winTeamButton3.jpg
diff --git a/Skins/Deluxe/x_Autum.ini b/Skins/Deluxe/x_Autum.ini
index 306023b7..325ef268 100644
--- a/Skins/Deluxe/x_Autum.ini
+++ b/Skins/Deluxe/x_Autum.ini
@@ -87,6 +87,9 @@ Joker             =[party]Joker.jpg
 PartyPlayerButton =[party]playerButton.jpg

 PartyTeamButton1  =[party]roundTeamButton.jpg

 PartyTeamButton2  =[party]playerTeamButton.jpg

+PartyTeamButton3  =[party]winTeamButton1.jpg

+PartyTeamButton4  =[party]winTeamButton2.jpg

+PartyTeamButton5  =[party]winTeamButton3.jpg

 PartyRoundBG1     =[party]roundBG1.jpg

 PartyRoundBG2     =[party]roundBG2.jpg

 PartyRoundBG3     =[party]roundBG3.jpg

@@ -96,7 +99,10 @@ PartyTeamPoints   =[party]teamPoints.jpg
 PartyScoreDeco    =x_[party]scoreDecoration.jpg

 PartyScoreBG1     =[party]scoreBG1.jpg

 PartyScoreBG2     =[party]scoreBG2.jpg

-

+PartyWinDeco1     =x_[party]winDecoration1.jpg

+PartyWinDeco2     =x_[party]winDecoration1.jpg

+PartyWinDeco3     =x_[party]winDecoration1.jpg

+                   

 # # # S T A T S # # #

 StatOverviewBG   = [stat]OverviewBG.jpg

 StatEntryBG = [stat]EntryBG.jpg

diff --git a/Skins/Deluxe/x_[party]winDecoration1.jpg b/Skins/Deluxe/x_[party]winDecoration1.jpg
new file mode 100644
index 00000000..0277f529
--- /dev/null
+++ b/Skins/Deluxe/x_[party]winDecoration1.jpg
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index ebc87403..6561661b 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -5736,99 +5736,173 @@ Size =7
 Align=0

 Text=PARTY_WIN_LEGEND_CONTINUE

 

-[PartyWinTextWinner]

-X =150

-Y =20

-Color =White

-Font =1

-Size =14

-Text =The Winner is...

-Align=0

+#[PartyWinTextWinner]

+#X =150

+#Y =120

+#Color =White

+#Font =1

+#Size =14

+#Text =The Winner is...

+#Align=0

 

 [PartyWinTextScoreTeam1]

-X =400

-Y =150

+X =699

+Y =183

 Color =White

-Font =1

-Size =15

+Font =0

+Size =19

 Text =3000

-Align=1

+Align=2

 

 [PartyWinTextScoreTeam2]

-X =100

-Y =450

+X =669

+Y =298

 Color =White

-Font =1

-Size =13

+Font =0

+Size =12

 Text =2000

-Align=0

+Align=2

 

 [PartyWinTextScoreTeam3]

-X =400

-Y =450

+X =649

+Y =398

 Color =White

-Font =1

-Size =13

+Font =0

+Size =9

 Text =1000

-Align=0

+Align=2

 

 [PartyWinTextNameTeam1]

-X =400

-Y =100

-Color =White

-Font =1

-Size =15

-Text =Team 1

-Align=1

+X =169

+Y =183

+Font=0

+Size=19

+Align=0

+Text=Team 1

+Color=White

 

 [PartyWinTextNameTeam2]

-X =100

-Y =400

+X =289

+Y =298

 Color =White

-Font =1

-Size =13

+Font =0

+Size =12

 Text =Team 2

 Align=0

 

 [PartyWinTextNameTeam3]

-X =400

-Y =400

+X =369

+Y =398

 Color =White

-Font =1

-Size =13

+Font =0

+Size =9

 Text =Team 3

 Align=0

 

 [PartyWinStaticTeam1]

-X =380

-Y =100

-W =0

-H =00

-Tex=Leiste1

-Color =AquaLightGreen

+X =169

+Y =230

+W =530

+H =16

+Z =1

+Tex=PartyTeamPoints

+Color =P1Dark

 Int = 1

 Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam1BG]

+Tex=PartyTeamButton3

+X=159

+Y=185

+W=550

+H=65

+Type=Font Black

+Color =P1Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam1Deco]

+Tex =PartyWinDeco1

+X = 91

+Y = 176

+W = 79

+H = 79

+Type =Font Black

+Color =Gold

+Reflection=1

+ReflectionSpacing=3

 

 [PartyWinStaticTeam2]

-X =380

-Y =250

-W =0

-H =0

-Tex=Leiste1

-Color =AquaLightGreen

+X =289

+Y =330

+W =380

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P2Dark

 Int = 1

 Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam2BG]

+Tex=PartyTeamButton4

+X=279

+Y=300

+W=400

+H=50

+Type=Font Black

+Color =P2Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam2Deco]

+Tex =PartyWinDeco2

+X = 226

+Y = 291

+W = 64

+H = 64

+Type =Font Black

+Color =Silver

+Reflection=1

+ReflectionSpacing=3

 

 [PartyWinStaticTeam3]

-X =380

-Y =400

-W =0

-H =0

-Tex=Leiste1

-Color =AquaLightGreen

+X =369

+Y =420

+W =280

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P3Dark

 Int = 1

 Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam3BG]

+Tex=PartyTeamButton5

+X=359

+Y=400

+W=300

+H=40

+Type=Font Black

+Color =P3Dark

+Reflection=1

+ReflectionSpacing=2

 

+[PartyWinStaticTeam3Deco]

+Tex =PartyWinDeco3

+X = 316

+Y = 391

+W = 54

+H = 54

+Type =Font Black

+Color =Bronze

+Reflection=1

+ReflectionSpacing=3

 

 [PartyOptions]

 Texts = 5