From 5b1d0bc8d9ed3fedefc8aa9acd8a5d884dc23ceb Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 4 Nov 2011 15:35:06 -0500 Subject: [PATCH 1/2] revert my fix for issue 314 since apparently that wasn't the problem --- src/ScoreKeeperRave.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScoreKeeperRave.cpp b/src/ScoreKeeperRave.cpp index 87ff254a1a..22d2e82706 100644 --- a/src/ScoreKeeperRave.cpp +++ b/src/ScoreKeeperRave.cpp @@ -143,7 +143,7 @@ void ScoreKeeperRave::AddSuperMeterDelta( float fUnscaledPercentChange ) { LaunchAttack( oldAL ); if( newAL == NUM_ATTACK_LEVELS ) // hit upper bounds of meter - m_pPlayerState->m_fSuperMeter = 0.f; + m_pPlayerState->m_fSuperMeter -= 1.f; } // mercy: if losing remove attacks on life drain From f8da50b52f2fc42592586150b9e23a7780e74bd1 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 4 Nov 2011 15:37:23 -0500 Subject: [PATCH 2/2] I don't know why in the hell these values were positive but i'm going to hit someone. fixes issue 622. --- Docs/Changelog_sm5.txt | 5 +++++ src/ScoreKeeperRave.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 9ba1f8430b..92d6722448 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania 5.0 $next | 2011xxxx -------------------------------------------------------------------------------- +2011/11/04 +* [ScoreKeeperRave] Revert fix from 2011/10/28. [AJ] +* [ScoreKeeperRave] Fixed Miss and HitMine giving meter life. + (Fixes issue 622.) [AJ] + 2011/11/02 ---------- * [ArchHooks] Add the GetArchName lua binding. To the themers that use diff --git a/src/ScoreKeeperRave.cpp b/src/ScoreKeeperRave.cpp index 22d2e82706..7d2515d1d2 100644 --- a/src/ScoreKeeperRave.cpp +++ b/src/ScoreKeeperRave.cpp @@ -21,8 +21,8 @@ static const float g_fSuperMeterPercentChangeInit[] = +0.02f, // SE_W3 +0.00f, // SE_W4 +0.00f, // SE_W5 - +0.20f, // SE_Miss - +0.40f, // SE_HitMine + -0.20f, // SE_Miss + -0.40f, // SE_HitMine -0.02f, // SE_CheckpointMiss +0.04f, // SE_Held -0.20f, // SE_LetGo