actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #846 from dguzek/MaxRegenComboAfterMiss

Browse Source 
reinstate MaxRegenComboAfterMiss Preference
This commit is contained in:
Kyzentun
2015-10-07 15:44:59 -06:00
parent ba8d31bfbd 3716468923
commit dca80f91ae
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LifeMeterBar.cpp
+7 -1
View File
@@ -211,7 +211,13 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
fDeltaLife *= 1 + (float)m_iProgressiveLifebar/8 * m_iMissCombo; fDeltaLife *= 1 + (float)m_iProgressiveLifebar/8 * m_iMissCombo;
// do this after; only successive W5/miss will increase the amount of life lost. // do this after; only successive W5/miss will increase the amount of life lost.
m_iMissCombo++; m_iMissCombo++;
m_iComboToRegainLife = PREFSMAN->m_iRegenComboAfterMiss; /* Increase by m_iRegenComboAfterMiss; never push it beyond m_iMaxRegenComboAfterMiss
* but don't reduce it if it's already past. */
const int NewComboToRegainLife = min(
(int)PREFSMAN->m_iMaxRegenComboAfterMiss,
m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss );
m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife );
} }
// If we've already failed, there's no point in letting them fill up the bar again. // If we've already failed, there's no point in letting them fill up the bar again.
src/PrefsManager.cpp
+1
View File
@@ -202,6 +202,7 @@ PrefsManager::PrefsManager() :
m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ), m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ),
m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 5 ), // this was 10 by default in SM3.95 -dguzek
m_bMercifulDrain ( "MercifulDrain", false ), // negative life deltas are scaled by the players life percentage m_bMercifulDrain ( "MercifulDrain", false ), // negative life deltas are scaled by the players life percentage
m_HarshHotLifePenalty ( "HarshHotLifePenalty", true ), m_HarshHotLifePenalty ( "HarshHotLifePenalty", true ),
m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter
src/PrefsManager.h
+2 -1
View File
@@ -193,7 +193,8 @@ public:
Preference<float> m_fLifeDifficultyScale; Preference<float> m_fLifeDifficultyScale;
// Whoever added these: Please add a comment saying what they do. -Chris // Whoever added these: Please add a comment saying what they do. -Chris
Preference<int> m_iRegenComboAfterMiss; Preference<int> m_iRegenComboAfterMiss; // combo that must be met after a Miss to regen life
Preference<int> m_iMaxRegenComboAfterMiss; // caps RegenComboAfterMiss if multiple Misses occur in rapid succession
Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage
Preference<bool> m_HarshHotLifePenalty; // See LifeMeterBar.cpp -Kyz Preference<bool> m_HarshHotLifePenalty; // See LifeMeterBar.cpp -Kyz
Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter