Added: Keys 1.2.3 to use Joker in Popup-Party-Menu

Added: 2 sets of Statics for Song-Screen. (need work, just startet)
Some Fixes in Deluxe Theme. (missing texts, fixed positions etc.)

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

7 files changed, 297 insertions, 12 deletions

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index b92ef4fb..d3358440 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -293,6 +293,13 @@ type
     StaticTeam3Joker3: TThemeStatic;

     StaticTeam3Joker4: TThemeStatic;

     StaticTeam3Joker5: TThemeStatic;

+

+

+

+    StaticKeys1      : TThemeStatic;

+    TextKeys1        : TThemeText;

+

+

   end;

 

    TThemeSing = class(TThemeBasic)

@@ -1002,6 +1009,9 @@ begin
       ThemeLoadStatic(Song.StaticTeam3Joker4, 'SongStaticTeam3Joker4');

       ThemeLoadStatic(Song.StaticTeam3Joker5, 'SongStaticTeam3Joker5');

 

+      ThemeLoadStatic(Song.StaticKeys1, 'SongStaticKeys1');

+      ThemeLoadText(Song.TextKeys1, 'SongStaticKeys1Text');

+

       // Sing

       ThemeLoadBasic(Sing, 'Sing');

 

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 9fcb7ee8..2ce6b6df 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -52,7 +52,9 @@ type
       StaticTeam3Joker3: Cardinal;

       StaticTeam3Joker4: Cardinal;

       StaticTeam3Joker5: Cardinal;

-      

+      StaticKeys1: Cardinal;

+      TextKeys1: integer;

+

       constructor Create; override;

       procedure SetScroll;

       procedure SetScroll1;

@@ -79,7 +81,7 @@ type
       //Party Mode

       procedure SelectRandomSong;

       procedure SetJoker;

-

+      procedure SetStatics;

       //procedures for Menu

       procedure StartSong;

       procedure OpenEditor;

@@ -662,6 +664,10 @@ begin
   StaticTeam3Joker4 := AddStatic(Theme.Song.StaticTeam3Joker4);

   StaticTeam3Joker5 := AddStatic(Theme.Song.StaticTeam3Joker5);

 

+  StaticKeys1 := AddStatic(Theme.Song.StaticKeys1);

+

+  TextKeys1 := AddText(Theme.Song.TextKeys1);

+

   // Song List

 //  Songs.LoadSongList; // moved to the UltraStar unit

   CatSongs.Refresh;

@@ -1215,6 +1221,7 @@ begin
   end;

 

   SetJoker;

+  SetStatics;

 end;

 

 procedure TScreenSong.onHide;

@@ -1646,6 +1653,21 @@ begin
   end;

 end;

 

+procedure TScreenSong.SetStatics;

+begin

+  //If Party Mode

+  if Mode = 1 then //Use Statics for Party-Song-Selection

+  begin

+    Static[StaticKeys1].Visible := false;

+    Text[TextKeys1].Visible := false;

+  end

+  else //Use regular Statics for Song-Selection

+  begin //Hide all

+    Static[StaticKeys1].Visible := true;

+    Text[TextKeys1].Visible := true;

+  end;

+end;

+

 //Procedures for Menu

 

 procedure TScreenSong.StartSong;

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 73b38a05..537536bb 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -96,6 +96,39 @@ begin
           if (Interaction=3) then

             InteractDec;

         end;

+

+      SDLK_1:

+        begin //Jocker

+            //Joker spielen

+          case CurMenu of

+            SM_Party_Main:

+            begin

+              ScreenSong.DoJoker(0)

+            end;

+          end;

+        end;

+      SDLK_2:

+        begin //Jocker

+            //Joker spielen

+          case CurMenu of

+            SM_Party_Main:

+            begin

+              ScreenSong.DoJoker(1)

+            end;

+          end;

+        end;

+      SDLK_3:

+        begin //Jocker

+            //Joker spielen

+          case CurMenu of

+            SM_Party_Main:

+            begin

+              ScreenSong.DoJoker(2)

+            end;

+          end;

+        end;

+

+

     end;

   end;

 end;

diff --git a/Languages/English.ini b/Languages/English.ini
index 9a9c3975..f373ce7e 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -176,7 +176,7 @@ SONG_MENU_NO=No
 SONG_MENU_NAME_PLAYLIST_LOAD=Open Playlist

 SONG_MENU_PLAYLIST_LOAD=open

 

-SONG_MENU_NAME_PARTY=Party Menu

+SONG_MENU_NAME_PARTY_MAIN=Party Menu

 SONG_MENU_JOKER=Joker

 

 SONG_MENU_NAME_PARTY_JOKER=take joker

diff --git a/Languages/German.ini b/Languages/German.ini
index 9e66e276..b26b82ba 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -176,7 +176,7 @@ SONG_MENU_NO=Nein
 SONG_MENU_NAME_PLAYLIST_LOAD=Playlist öffnen

 SONG_MENU_PLAYLIST_LOAD=Öffnen

 

-SONG_MENU_NAME_PARTY=Party-Menü

+SONG_MENU_NAME_PARTY_MAIN=Party-Menü

 SONG_MENU_JOKER=Joker

 

 SONG_MENU_NAME_PARTY_JOKER=Joker spielen

diff --git a/Languages/readme.txt b/Languages/readme.txt
index 82c5bfb2..eebc9521 100644
--- a/Languages/readme.txt
+++ b/Languages/readme.txt
@@ -80,7 +80,7 @@ SONG_MENU_NAME_PLAYLIST_LOAD=Open Playlist
 SONG_MENU_PLAYLIST_LOAD=open

 

 #Menu Party Modus

-SONG_MENU_NAME_PARTY=Menu

+SONG_MENU_NAME_PARTY_MAIN=Menu

 SONG_MENU_JOKER=Joker

 

 SONG_MENU_NAME_PARTY_JOKER=take Joker

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index cbc6b6dc..ed92ae3c 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -480,7 +480,7 @@ Size =7
 Align=0

 Text=SONG_JUMPTO_DESC

 

-[SongStatic10]

+[SongStaticKeys1]

 X =679

 Y =553

 W =22

@@ -488,8 +488,9 @@ H =22
 Tex=ButtonP

 Color =White

 Type=Plain

+Texts=1

 

-[SongText7]

+[SongStaticKeys1Text]

 X =705

 Y =552

 Color=Black

@@ -528,12 +529,12 @@ Align =1
 Text=

 

 [SongTextNumber]

-X =350

-Y =430

+X =440

+Y =495

 Color=White

 Font =0

 Size =8

-Align =1

+Align =2

 Text=

 

 [SongStaticTeam1Joker1]

@@ -4164,7 +4165,7 @@ Align=0
 Text =SING_OPTIONS_GAME_DIFFICULTY

 

 [Top5TextLevel]

-X =250

+X =270

 Y =73

 Color =White

 Font =0

@@ -5823,6 +5824,79 @@ Color =P1Dark
 Reflection=1

 ReflectionSpacing=2

 

+[PartyWinStaticTeam1Rank1]

+X =169

+Y =230

+W =530

+H =16

+Z =1

+Tex=PartyTeamPoints

+Color =P1Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam1BGRank1]

+Tex=PartyTeamButton3

+X=159

+Y=185

+W=550

+H=65

+Type=Font Black

+Color =P1Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam1Rank2]

+X =289

+Y =330

+W =380

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P1Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam1BGRank2]

+Tex=PartyTeamButton3

+X=279

+Y=300

+W=400

+H=50

+Type=Font Black

+Color =P1Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam1Rank3]

+X =369

+Y =420

+W =280

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P1Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam1BGRank3]

+Tex=PartyTeamButton3

+X=359

+Y=400

+W=300

+H=40

+Type=Font Black

+Color =P1Dark

+Reflection=1

+ReflectionSpacing=2

+

+

 [PartyWinStaticTeam1Deco]

 Tex =PartyWinDeco1

 X = 91

@@ -5858,6 +5932,78 @@ Color =P2Dark
 Reflection=1

 ReflectionSpacing=2

 

+[PartyWinStaticTeam2Rank1]

+X =169

+Y =230

+W =530

+H =16

+Z =1

+Tex=PartyTeamButton3

+Color =P2Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam2BGRank1]

+Tex=PartyTeamButton4

+X=159

+Y=185

+W=550

+H=65

+Type=Font Black

+Color =P2Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam2Rank2]

+X =289

+Y =330

+W =380

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P2Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam2BGRank2]

+Tex=PartyTeamButton4

+X=279

+Y=300

+W=400

+H=50

+Type=Font Black

+Color =P2Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam2Rank3]

+X =369

+Y =420

+W =280

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P2Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam2BGRank3]

+Tex=PartyTeamButton4

+X=359

+Y=400

+W=300

+H=40

+Type=Font Black

+Color =P2Dark

+Reflection=1

+ReflectionSpacing=2

+

 [PartyWinStaticTeam2Deco]

 Tex =PartyWinDeco2

 X = 226

@@ -5893,6 +6039,78 @@ Color =P3Dark
 Reflection=1

 ReflectionSpacing=2

 

+[PartyWinStaticTeam3Rank1]

+X =169

+Y =230

+W =530

+H =16

+Z =1

+Tex=PartyTeamPoints

+Color =P3Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam3BGRank1]

+Tex=PartyTeamButton3

+X=159

+Y=185

+W=550

+H=65

+Type=Font Black

+Color =P3Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam3Rank2]

+X =289

+Y =330

+W =380

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P3Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam3BGRank2]

+Tex=PartyTeamButton5

+X=279

+Y=300

+W=400

+H=50

+Type=Font Black

+Color =P3Dark

+Reflection=1

+ReflectionSpacing=2

+

+[PartyWinStaticTeam3Rank3]

+X =369

+Y =420

+W =280

+H =15

+Z =1

+Tex=PartyTeamPoints

+Color =P3Dark

+Int = 1

+Type=Font Black

+Reflection=1

+ReflectionSpacing=12

+

+[PartyWinStaticTeam3BGRank3]

+Tex=PartyTeamButton5

+X=359

+Y=400

+W=300

+H=40

+Type=Font Black

+Color =P3Dark

+Reflection=1

+ReflectionSpacing=2

+

 [PartyWinStaticTeam3Deco]

 Tex =PartyWinDeco3

 X = 316

@@ -6725,9 +6943,11 @@ Z=1
 [SongMenuSelectSlide3]

 Tex = Rectangle

 TexSBG = Rectangle

+Color =LightBlue

+DColor = DarkBlue

 Text =

 X = 460

-Y = 225

+Y = 195

 Z = 0.99

 W = 0

 H = 25