diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 45008d3280..c0d71a1be3 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -16,7 +16,8 @@ sm-ssc v1.2.1 | 2011011? 20110115 -------- * [ArrowEffects] Allow modifying modifier characteristics in the metrics. - At present, Blink, Brake, and Boost can have modifications. [Wolfman2000] + At present, Blink, Boost, Brake, and Wave can have modifications. + [Wolfman2000] 20110112 -------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index b50d2c931e..75483a5825 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -133,6 +133,8 @@ BoostModMinClamp=-400 BoostModMaxClamp=400 BrakeModMinClamp=-400 BrakeModMaxClamp=400 +WaveModMagnitude=20 +WaveModHeight=38 [Background] # Background stuff. again, its usually a better idea to leave this alone diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 9fc2bf0239..a5753ec4f7 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -21,6 +21,8 @@ static ThemeMetric BOOST_MOD_MIN_CLAMP( "ArrowEffects", "BoostModMinClamp static ThemeMetric BOOST_MOD_MAX_CLAMP( "ArrowEffects", "BoostModMaxClamp" ); static ThemeMetric BRAKE_MOD_MIN_CLAMP( "ArrowEffects", "BrakeModMinClamp" ); static ThemeMetric BRAKE_MOD_MAX_CLAMP( "ArrowEffects", "BrakeModMaxClamp" ); +static ThemeMetric WAVE_MOD_MAGNITUDE( "ArrowEffects", "WaveModMagnitude" ); +static ThemeMetric WAVE_MOD_HEIGHT( "ArrowEffects", "WaveModHeight" ); static float GetNoteFieldHeight( const PlayerState* pPlayerState ) { @@ -232,7 +234,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float fYAdjust += fBrakeYAdjust; } if( fAccels[PlayerOptions::ACCEL_WAVE] != 0 ) - fYAdjust += fAccels[PlayerOptions::ACCEL_WAVE] * 20.0f*RageFastSin( fYOffset/38.0f ); + fYAdjust += fAccels[PlayerOptions::ACCEL_WAVE] * WAVE_MOD_MAGNITUDE *RageFastSin( fYOffset/WAVE_MOD_HEIGHT ); fYOffset += fYAdjust;