Add MenuTimer HurryUp transition metric.
This commit is contained in:
@@ -23,6 +23,7 @@ sm-ssc v1.2.1 | 2011011?
|
|||||||
* [Player] Allow the default attack times for both random and mine attacks
|
* [Player] Allow the default attack times for both random and mine attacks
|
||||||
to be changed. [Wolfman2000]
|
to be changed. [Wolfman2000]
|
||||||
* [NoteField] Allow for adjustable fade fail time (for AJ). [Wolfman2000]
|
* [NoteField] Allow for adjustable fade fail time (for AJ). [Wolfman2000]
|
||||||
|
* [MenuTimer] Allow the hurry up transition to be adjusted. [Wolfman2000]
|
||||||
|
|
||||||
20110112
|
20110112
|
||||||
--------
|
--------
|
||||||
|
|||||||
@@ -697,6 +697,7 @@ WarningBeepStart=10
|
|||||||
# MaxStallSeconds=7.5
|
# MaxStallSeconds=7.5
|
||||||
MaxStallSeconds=0
|
MaxStallSeconds=0
|
||||||
#
|
#
|
||||||
|
HurryUpTransition=5.5
|
||||||
Text1OnCommand=stopeffect;stoptweening;shadowlength,0;
|
Text1OnCommand=stopeffect;stoptweening;shadowlength,0;
|
||||||
Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds); return ""..digit end
|
Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds); return ""..digit end
|
||||||
Text2OnCommand=stopeffect;stoptweening;shadowlength,0;visible,false
|
Text2OnCommand=stopeffect;stoptweening;shadowlength,0;visible,false
|
||||||
|
|||||||
+2
-1
@@ -47,6 +47,7 @@ void MenuTimer::Load( RString sMetricsGroup )
|
|||||||
WARNING_START.Load(sMetricsGroup,"WarningStart");
|
WARNING_START.Load(sMetricsGroup,"WarningStart");
|
||||||
WARNING_BEEP_START.Load(sMetricsGroup,"WarningBeepStart");
|
WARNING_BEEP_START.Load(sMetricsGroup,"WarningBeepStart");
|
||||||
MAX_STALL_SECONDS.Load(sMetricsGroup,"MaxStallSeconds");
|
MAX_STALL_SECONDS.Load(sMetricsGroup,"MaxStallSeconds");
|
||||||
|
HURRY_UP_TRANSITION.Load(sMetricsGroup,"HurryUpTransition");
|
||||||
|
|
||||||
// clear warning commands out if they already exist. -aj
|
// clear warning commands out if they already exist. -aj
|
||||||
if(WARNING_COMMAND)
|
if(WARNING_COMMAND)
|
||||||
@@ -90,7 +91,7 @@ void MenuTimer::Update( float fDeltaTime )
|
|||||||
if( fOldSecondsLeft == fNewSecondsLeft )
|
if( fOldSecondsLeft == fNewSecondsLeft )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
|
if( fOldSecondsLeft > HURRY_UP_TRANSITION && fNewSecondsLeft < HURRY_UP_TRANSITION )
|
||||||
SOUND->PlayOnceFromAnnouncer( "hurry up" );
|
SOUND->PlayOnceFromAnnouncer( "hurry up" );
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ protected:
|
|||||||
ThemeMetric<int> WARNING_START;
|
ThemeMetric<int> WARNING_START;
|
||||||
ThemeMetric<int> WARNING_BEEP_START;
|
ThemeMetric<int> WARNING_BEEP_START;
|
||||||
ThemeMetric<float> MAX_STALL_SECONDS;
|
ThemeMetric<float> MAX_STALL_SECONDS;
|
||||||
|
ThemeMetric<float> HURRY_UP_TRANSITION;
|
||||||
ThemeMetric1D<apActorCommands> *WARNING_COMMAND;
|
ThemeMetric1D<apActorCommands> *WARNING_COMMAND;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user