- added ScreenPartyRounds (a screen to select the modes to play)

- added missing language entries to German and English language file
- themed ScreenPartyOptions
- some minor theme changes concerning party screens
- some minor code changes concerning party screens

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

4 files changed, 259 insertions, 58 deletions

diff --git a/Lua/src/screens/UScreenPartyNewRound.pas b/Lua/src/screens/UScreenPartyNewRound.pas
index f5e51a0d..b52efd21 100644
--- a/Lua/src/screens/UScreenPartyNewRound.pas
+++ b/Lua/src/screens/UScreenPartyNewRound.pas
@@ -221,7 +221,7 @@ begin
       Text[TextWinner[I]].Visible := True;
 
       // update texts:
-      Text[TextRound[I]].Text := Language.Translate('PLUGIN_' + uppercase(Party.Modes[Party.Rounds[I].Mode].Name) + '_NAME');
+      Text[TextRound[I]].Text := Language.Translate('MODE_' + uppercase(Party.Modes[Party.Rounds[I].Mode].Name) + '_NAME');
       Text[TextWinner[I]].Text := Party.GetWinnerString(I);
     end
     else
@@ -298,7 +298,7 @@ begin
   end;  
 
   //nextRound Texts
-  Text[TextNextRound].Text := Language.Translate('PLUGIN_' + uppercase(Party.Modes[Party.Rounds[Party.CurrentRound].Mode].Name) + '_DESC');
+  Text[TextNextRound].Text := Language.Translate('MODE_' + uppercase(Party.Modes[Party.Rounds[Party.CurrentRound].Mode].Name) + '_DESC');
   Text[TextNextRoundNo].Text := InttoStr(Party.CurrentRound + 1);
   if (Length(Party.Teams) >= 1) then
   begin
diff --git a/Lua/src/screens/UScreenPartyOptions.pas b/Lua/src/screens/UScreenPartyOptions.pas
index e620029a..3dce9954 100644
--- a/Lua/src/screens/UScreenPartyOptions.pas
+++ b/Lua/src/screens/UScreenPartyOptions.pas
@@ -44,34 +44,26 @@ uses
 
 type
   TScreenPartyOptions = class(TMenu)
-    public
+    private
       SelectLevel:     cardinal;
       SelectPlayList:  cardinal;
       SelectPlayList2: cardinal;
       SelectRounds:    cardinal;
 
+      IPlaylist: array[0..2] of UTF8String;
+      IPlaylist2: array of UTF8String;
+
       PlayList:  integer;
       PlayList2: integer;
-      Rounds:    integer;
-      NumTeams:  integer;
-      NumPlayer1, NumPlayer2, NumPlayer3: integer;
-
+      
+      procedure SetPlaylist2;
+    public 
       constructor Create; override;
       function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure OnShow; override;
       procedure SetAnimationProgress(Progress: real); override;
-      procedure SetPlaylist2;
   end;
 
-var
-  IPlaylist: array[0..2] of UTF8String;
-  IPlaylist2: array of UTF8String;
-
-  const
-  ITeams:   array[0..1] of UTF8String = ('2', '3');
-  IPlayers: array[0..3] of UTF8String = ('1', '2', '3', '4');
-  IRounds:  array[0..5] of UTF8String = ('2', '3', '4', '5', '6', '7');
-
 implementation
 
 uses
@@ -118,27 +110,11 @@ begin
           //Don'T start when Playlist is Selected and there are no Playlists
           if (Playlist = 2) and (Length(PlaylistMan.Playlists) = 0) then
             Exit;
-          {// Don't start when SinglePlayer Teams but only Multiplayer Plugins available
-          OnlyMultiPlayer := true;
-          for I := 0 to High(DLLMan.Plugins) do
-          begin
-            OnlyMultiPlayer := (OnlyMultiPlayer and DLLMan.Plugins[I].TeamModeOnly);
-          end;
-          if (OnlyMultiPlayer) and ((NumPlayer1 = 0) or (NumPlayer2 = 0) or ((NumPlayer3 = 0) and (NumTeams = 1))) then
-          begin
-            ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
-            Exit;
-          end;}
+
           //Save Difficulty
           Ini.Difficulty := SelectsS[SelectLevel].SelectedOption;
           Ini.SaveLevel;
 
-          {//Save Num Teams:
-          PartySession.Teams.NumTeams := NumTeams + 2;
-          PartySession.Teams.Teaminfo[0].NumPlayers := NumPlayer1+1;
-          PartySession.Teams.Teaminfo[1].NumPlayers := NumPlayer2+1;
-          PartySession.Teams.Teaminfo[2].NumPlayers := NumPlayer3+1};
-
           //Save Playlist
           PlaylistMan.Mode := TSingMode( Playlist );
           PlaylistMan.CurPlayList := High(cardinal);
@@ -213,18 +189,24 @@ begin
   SetLength(IPlaylist2, 1);
   IPlaylist2[0] := '---';
 
-  //Clear all Selects  
-  Rounds := 5;
+  //Clear all Selects
   PlayList := 0;
   PlayList2 := 0;
 
   //Load Screen From Theme
   LoadFromTheme(Theme.PartyOptions);
 
+  Theme.PartyOptions.SelectLevel.oneItemOnly := true;
+  Theme.PartyOptions.SelectLevel.showArrows := true;
   SelectLevel     := AddSelectSlide(Theme.PartyOptions.SelectLevel, Ini.Difficulty, Theme.ILevel);
+
+  Theme.PartyOptions.SelectPlayList.oneItemOnly := true;
+  Theme.PartyOptions.SelectPlayList.showArrows := true;
   SelectPlayList  := AddSelectSlide(Theme.PartyOptions.SelectPlayList, PlayList, IPlaylist);
+
+  Theme.PartyOptions.SelectPlayList2.oneItemOnly := true;
+  Theme.PartyOptions.SelectPlayList2.showArrows := true;
   SelectPlayList2 := AddSelectSlide(Theme.PartyOptions.SelectPlayList2, PlayList2, IPlaylist2);
-  SelectRounds    := AddSelectSlide(Theme.PartyOptions.SelectRounds, Rounds, IRounds);
 
   Interaction := 0;
 end;
diff --git a/Lua/src/screens/UScreenPartyPlayer.pas b/Lua/src/screens/UScreenPartyPlayer.pas
index 2cdc0366..3fcaa4ba 100644
--- a/Lua/src/screens/UScreenPartyPlayer.pas
+++ b/Lua/src/screens/UScreenPartyPlayer.pas
@@ -151,32 +151,12 @@ begin
 
   if (Party.ModesAvailable) then
   begin //mode for current playersetup available
-    // to - do : add round select screen
-    // atm just add random rounds to the rounds array
-    SetLength(Rounds, ScreenPartyOptions.Rounds + 2);
-
-    for I := 0 to High(Rounds) do
-      Rounds[I] := Party_Round_Random;
-
-    // start party game
-    if (Party.StartGame(Rounds)) then
-    begin
-      FadeTo(@ScreenPartyNewRound, SoundLib.Start);
-    end
-    else
-    begin
-      //error starting party game
-      ScreenPopupError.ShowPopup(Language.Translate('ERROR_CAN_NOT_START_PARTY'));
-
-      Party.Clear;
-    end;
-
+    FadeTo(@ScreenPartyRounds, SoundLib.Start);
   end
   else
   begin
     // no mode available for current player setup
     ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_MODES_FOR_CURRENT_SETUP'));
-
     Party.Clear;
   end;
 end;
@@ -443,6 +423,8 @@ begin
     Button[10].Text[0].Text := Ini.NameTeam[2];
     // Templates for Names Mod end
 
+  Party.Clear;
+
   UpdateInterface;
 end;
 
diff --git a/Lua/src/screens/UScreenPartyRounds.pas b/Lua/src/screens/UScreenPartyRounds.pas
new file mode 100644
index 00000000..146b8beb
--- /dev/null
+++ b/Lua/src/screens/UScreenPartyRounds.pas
@@ -0,0 +1,237 @@
+{* UltraStar Deluxe - Karaoke Game

+ *

+ * UltraStar Deluxe is the legal property of its developers, whose names

+ * are too numerous to list here. Please refer to the COPYRIGHT

+ * file distributed with this source distribution.

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License

+ * as published by the Free Software Foundation; either version 2

+ * of the License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; see the file COPYING. If not, write to

+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+ * Boston, MA 02110-1301, USA.

+ *

+ * $URL: https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/branches/experimental/Lua/src/screens/UScreenPartyOptions.pas $

+ * $Id: UScreenPartyOptions.pas 2036 2009-12-14 20:59:44Z whiteshark0 $

+ *}

+

+unit UScreenPartyRounds;

+

+interface

+

+{$IFDEF FPC}

+  {$MODE Delphi}

+{$ENDIF}

+

+{$I switches.inc}

+

+uses

+  UMenu,

+  SDL,

+  UDisplay,

+  UMusic,

+  UFiles,

+  SysUtils,

+  UThemes;

+

+type

+  TScreenPartyRounds = class(TMenu)

+    private

+      SelectRoundCount: cardinal;

+      SelectRound: array [0..6] of cardinal;

+

+      RoundCount: integer;

+      Round: array [0..6] of integer;

+

+      IModeNames: array of UTF8String;

+      IModeIDs: array of integer;

+

+      procedure UpdateInterface;

+      procedure StartParty;

+    public

+      constructor Create; override;

+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;

+      procedure OnShow; override;

+      procedure SetAnimationProgress(Progress: real); override;

+  end;

+

+const

+  IRoundCount:  array[0..5] of UTF8String = ('2', '3', '4', '5', '6', '7');

+

+implementation

+

+uses

+  UGraphic,

+  UMain,

+  UIni,

+  UTexture,

+  ULanguage,

+  UParty,

+  USong,

+  UDLLManager,

+  UPlaylist,

+  USongs,

+  UUnicodeUtils;

+

+procedure TScreenPartyRounds.UpdateInterface;

+  var

+    I: integer;

+    ActualRounds: integer;

+begin

+  ActualRounds := RoundCount + 2;

+

+  for I := 0 to High(SelectRound) do

+    SelectsS[SelectRound[I]].Visible := (I < ActualRounds);

+end;

+

+procedure TScreenPartyRounds.StartParty;

+  var

+    GameRounds: ARounds;

+    I: integer;

+begin

+  SetLength(GameRounds, RoundCount + 2);

+

+  for I := 0 to High(GameRounds) do

+    GameRounds[I] := IModeIds[Round[I]];

+

+  // start party game

+  if (Party.StartGame(GameRounds)) then

+  begin

+    FadeTo(@ScreenPartyNewRound, SoundLib.Start);

+  end

+  else

+  begin

+    //error starting party game

+    ScreenPopupError.ShowPopup(Language.Translate('ERROR_CAN_NOT_START_PARTY'));

+  end;

+end;

+

+function TScreenPartyRounds.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;

+var

+  I, J: integer;

+  OnlyMultiPlayer: boolean;

+begin

+  Result := true;

+  if (PressedDown) then

+  begin // Key Down

+    // check normal keys

+    case UCS4UpperCase(CharCode) of

+      Ord('Q'):

+        begin

+          Result := false;

+          Exit;

+        end;

+    end;

+

+    // check special keys

+    case PressedKey of

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

+        begin

+          AudioPlayback.PlaySound(SoundLib.Back);

+          FadeTo(@ScreenPartyPlayer);

+        end;

+

+      SDLK_RETURN: StartParty;

+

+      // Up and Down could be done at the same time,

+      // but I don't want to declare variables inside

+      // functions like this one, called so many times

+      SDLK_DOWN:    InteractNext;

+      SDLK_UP:      InteractPrev;

+      SDLK_RIGHT:

+        begin

+          AudioPlayback.PlaySound(SoundLib.Option);

+          InteractInc;

+

+          if Interaction = 0 then

+            UpdateInterface;

+        end;

+      SDLK_LEFT:

+        begin

+          AudioPlayback.PlaySound(SoundLib.Option);

+          InteractDec;

+

+          if Interaction = 0 then

+            UpdateInterface;

+        end;

+    end;

+  end;

+end;

+

+constructor TScreenPartyRounds.Create;

+  var

+    I: integer;

+begin

+  inherited Create;

+  RoundCount := 5;

+

+  //Load Screen From Theme

+  LoadFromTheme(Theme.PartyRounds);

+

+  Theme.PartyRounds.SelectRoundCount.oneItemOnly := true;

+  Theme.PartyRounds.SelectRoundCount.showArrows := true;

+  SelectRoundCount := AddSelectSlide(Theme.PartyRounds.SelectRoundCount, RoundCount, IRoundCount);

+

+  SetLength(IModeNames, 1);

+  IModeNames[0] := '---';

+  for I := 0 to high(Theme.PartyRounds.SelectRound) do

+  begin

+    Round[I] := 0;

+    Theme.PartyRounds.SelectRound[I].oneItemOnly := true;

+    Theme.PartyRounds.SelectRound[I].showArrows := true;

+    SelectRound[I] := AddSelectSlide(Theme.PartyRounds.SelectRound[I], Round[I], IModeNames);

+  end;

+

+

+  Interaction := 0;

+end;

+

+procedure TScreenPartyRounds.OnShow;

+  var

+    ModeList: AParty_ModeList;

+    I: integer;

+begin

+  inherited;

+

+  // check if there are loaded modes

+  if Party.ModesAvailable then

+  begin

+    UpdateInterface;

+    

+    ModeList := Party.GetAvailableModes;

+    SetLength(IModeNames, Length(ModeList));

+    SetLength(IModeIds, Length(ModeList));

+    for I := 0 to High(ModeList) do

+    begin

+      IModeNames[I] := ModeList[I].Name;

+      IModeIds[I]   := ModeList[I].Index;

+    end;

+

+    for I := 0 to High(SelectRound) do

+      UpdateSelectSlideOptions(Theme.PartyRounds.SelectRound[I] , SelectRound[I], IModeNames, Round[I]);

+  end

+  else

+  begin

+    // no mode available for current player setup

+    ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_MODES_FOR_CURRENT_SETUP'));

+    Party.Clear;

+    Display.AbortScreenChange;

+  end;

+end;

+

+procedure TScreenPartyRounds.SetAnimationProgress(Progress: real);

+begin

+  {for I := 0 to 6 do

+    SelectS[I].Texture.ScaleW := Progress;}

+end;

+

+end.