From 849c203572f87553206a5a973a8446cf0d228dbe Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Fri, 19 Feb 2010 18:25:14 +0000 Subject: added selection for 10, 20, ... 90 and 10000 medley songs in a row updated version git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2108 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenSong.pas | 94 +++++++++++++++++++++++++++++++++++++-- Game/Code/UltraStar.dpr | 2 +- 2 files changed, 91 insertions(+), 5 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index a6908278..207e5de1 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -422,7 +422,7 @@ begin (length(getVisibleMedleyArr(msCalculated))>0) then StartMedley(5, msCalculated) else if (Mode = smNormal) and (Length(getVisibleMedleyArr(msTag)) > 0) - and MakeMedley then + and not MakeMedley then StartMedley(5, msTag); end; @@ -882,7 +882,12 @@ begin begin //Joker spielen DoJoker(0, SDL_ModState); - end; + end else if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(10, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(10, msTag); end; SDLK_2: @@ -891,7 +896,12 @@ begin begin //Joker spielen DoJoker(1, SDL_ModState); - end; + end else if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(20, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(20, msTag); end; SDLK_3: @@ -900,7 +910,83 @@ begin begin //Joker spielen DoJoker(2, SDL_ModState); - end; + end else if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(30, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(30, msTag); + end; + + SDLK_4: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(40, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(40, msTag); + end; + + SDLK_5: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(50, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(50, msTag); + end; + + SDLK_6: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(60, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(60, msTag); + end; + + SDLK_7: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(70, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(70, msTag); + end; + + SDLK_8: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(80, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(80, msTag); + end; + + SDLK_9: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(90, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(90, msTag); + end; + + //stress test :> + SDLK_0: + begin + if (Mode = smNormal) and (SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL) and not MakeMedley and + (length(getVisibleMedleyArr(msCalculated))>0) then + StartMedley(10000, msCalculated) + else if (Mode = smNormal) and (SDL_ModState = KMOD_LCTRL) and (Length(getVisibleMedleyArr(msTag)) > 0) + and not MakeMedley then + StartMedley(10000, msTag); end; end; end; diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 1e3ce033..f13bc474 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -124,7 +124,7 @@ uses acinerella in 'lib\acinerella\acinerella.pas'; const - Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r6b 2010-02-17'; + Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 alpha 2010-02-19'; var WndTitle: string; -- cgit v1.2.3