Gotta stay caught up.

This commit is contained in:
Jason Felds
2011-11-30 00:32:46 -05:00
4 changed files with 8 additions and 0 deletions
+2
View File
@@ -14,6 +14,8 @@ StepMania 5.0 $next | 20111xxx
if mods should be overridden on survival or not. Funny enough, this used
to be true for the old Oni style mode, but...well, we'll cross that bridge
later. [Wolfman2000]
* [LifeMeterBattery] Added MaxLives metric, which limits the maximum amount of
lives. Setting this to 0 will remove the limit. [AJ]
2011/11/27
----------
+2
View File
@@ -573,6 +573,8 @@ OverY=0
# The bar that shows up in Oni mode.
# any score below this one will cause you to lose a life.
MinScoreToKeepLife='TapNoteScore_W3'
# Defines the maximum number of lives in the meter. (0 means no limit)
MaxLives=0
# how many lives you'll lose upon doing so.
SubtractLives=1
# how many lives you'll lose hitting a mine
+3
View File
@@ -24,6 +24,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
PlayerNumber pn = pPlayerState->m_PlayerNumber;
MIN_SCORE_TO_KEEP_LIFE.Load(sType, "MinScoreToKeepLife");
MAX_LIVES.Load(sType, "MaxLives");
DANGER_THRESHOLD.Load(sType, "DangerThreshold");
SUBTRACT_LIVES.Load(sType, "SubtractLives");
MINES_SUBTRACT_LIVES.Load(sType, "MinesSubtractLives");
@@ -120,6 +121,8 @@ void LifeMeterBattery::AddLives( int iLives )
{
if( iLives <= 0 )
return;
if( MAX_LIVES != 0 && m_iLivesLeft >= MAX_LIVES )
return;
m_iTrailingLivesLeft = m_iLivesLeft;
m_iLivesLeft += iLives;
+1
View File
@@ -47,6 +47,7 @@ private:
ThemeMetric<float> BATTERY_BLINK_TIME;
ThemeMetric<TapNoteScore> MIN_SCORE_TO_KEEP_LIFE;
ThemeMetric<int> DANGER_THRESHOLD;
ThemeMetric<int> MAX_LIVES;
ThemeMetric<int> SUBTRACT_LIVES;
ThemeMetric<int> MINES_SUBTRACT_LIVES;
ThemeMetric<int> HELD_ADD_LIVES;