Turns out this multiple toasty trigger thing is causing more problems than it solved. Back to the old implementation of a single toasty trigger for now.
update credits.
This commit is contained in:
@@ -30,6 +30,9 @@ Aldo_MX
|
|||||||
Jason Reid (jnr)
|
Jason Reid (jnr)
|
||||||
* Tested building sm-ssc on FreeBSD, provided fixes.
|
* Tested building sm-ssc on FreeBSD, provided fixes.
|
||||||
|
|
||||||
|
Wolfman
|
||||||
|
* [Player] PercentUntilColorCombo metric
|
||||||
|
|
||||||
Daisuke Master
|
Daisuke Master
|
||||||
* Pump/default, Pump/flat, and Pump/simple noteskins
|
* Pump/default, Pump/flat, and Pump/simple noteskins
|
||||||
* /Docs/Themerdocs/Noteskin elements Reference.txt
|
* /Docs/Themerdocs/Noteskin elements Reference.txt
|
||||||
|
|||||||
+14
-12
@@ -83,12 +83,12 @@ void ScoreKeeperNormal::Load(
|
|||||||
m_MinScoreToContinueCombo.Load( "Gameplay", "MinScoreToContinueCombo" );
|
m_MinScoreToContinueCombo.Load( "Gameplay", "MinScoreToContinueCombo" );
|
||||||
m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" );
|
m_MinScoreToMaintainCombo.Load( "Gameplay", "MinScoreToMaintainCombo" );
|
||||||
|
|
||||||
// Toasty triggers (ported from 3.9+)
|
// Toasty triggers (idea from 3.9+)
|
||||||
// todo: Needs to be a table of ints to be properly implemented 1:1,
|
// Multiple toasty support doesn't seem to be working right now.
|
||||||
// though the original implementation was a comma separated string.
|
// Since it's causing more problems than solutions, I'm going back to
|
||||||
// At this point, only one trigger seems to be playing, though the logic
|
// the old way of a single toasty trigger for now.
|
||||||
// looks okay. -aj
|
//m_vToastyTriggers.Load( "Gameplay", "ToastyTriggersAt" );
|
||||||
m_vToastyTriggers.Load( "Gameplay", "ToastyTriggersAt" );
|
m_ToastyTrigger.Load( "Gameplay", "ToastyTriggersAt" );
|
||||||
|
|
||||||
// Custom Scoring
|
// Custom Scoring
|
||||||
m_CustomComboMultiplier.Load( "CustomScoring", "ComboMultiplier" );
|
m_CustomComboMultiplier.Load( "CustomScoring", "ComboMultiplier" );
|
||||||
@@ -161,8 +161,8 @@ void ScoreKeeperNormal::Load(
|
|||||||
|
|
||||||
m_iScoreRemainder = 0;
|
m_iScoreRemainder = 0;
|
||||||
m_iCurToastyCombo = 0;
|
m_iCurToastyCombo = 0;
|
||||||
m_iCurToastyTrigger = 0;
|
//m_iCurToastyTrigger = 0;
|
||||||
m_iNextToastyAt = 0;
|
//m_iNextToastyAt = 0;
|
||||||
m_iMaxScoreSoFar = 0;
|
m_iMaxScoreSoFar = 0;
|
||||||
m_iPointBonus = 0;
|
m_iPointBonus = 0;
|
||||||
m_iNumTapsAndHolds = 0;
|
m_iNumTapsAndHolds = 0;
|
||||||
@@ -690,13 +690,14 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
|
|||||||
#endif //DEBUG
|
#endif //DEBUG
|
||||||
|
|
||||||
// Toasty combo
|
// Toasty combo
|
||||||
vector<int> iToastyMilestones;
|
//vector<int> iToastyMilestones;
|
||||||
switch( scoreOfLastTap )
|
switch( scoreOfLastTap )
|
||||||
{
|
{
|
||||||
case TNS_W1:
|
case TNS_W1:
|
||||||
case TNS_W2:
|
case TNS_W2:
|
||||||
m_iCurToastyCombo += iNumTapsInRow;
|
m_iCurToastyCombo += iNumTapsInRow;
|
||||||
|
|
||||||
|
/*
|
||||||
// compile the list of toasty triggers
|
// compile the list of toasty triggers
|
||||||
{
|
{
|
||||||
Lua *L = LUA->Get();
|
Lua *L = LUA->Get();
|
||||||
@@ -714,9 +715,10 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
|
|||||||
{
|
{
|
||||||
m_iNextToastyAt = -1;
|
m_iNextToastyAt = -1;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
if( m_iCurToastyCombo >= m_iNextToastyAt &&
|
if( m_iCurToastyCombo >= m_ToastyTrigger &&
|
||||||
m_iCurToastyCombo - iNumTapsInRow < m_iNextToastyAt &&
|
m_iCurToastyCombo - iNumTapsInRow < m_ToastyTrigger &&
|
||||||
!GAMESTATE->m_bDemonstrationOrJukebox )
|
!GAMESTATE->m_bDemonstrationOrJukebox )
|
||||||
{
|
{
|
||||||
SCREENMAN->PostMessageToTopScreen( SM_PlayToasty, 0 );
|
SCREENMAN->PostMessageToTopScreen( SM_PlayToasty, 0 );
|
||||||
@@ -728,7 +730,7 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
|
|||||||
// TODO: keep a pointer to the Profile. Don't index with m_PlayerNumber
|
// TODO: keep a pointer to the Profile. Don't index with m_PlayerNumber
|
||||||
PROFILEMAN->IncrementToastiesCount( m_pPlayerState->m_PlayerNumber );
|
PROFILEMAN->IncrementToastiesCount( m_pPlayerState->m_PlayerNumber );
|
||||||
|
|
||||||
m_iCurToastyTrigger++;
|
//m_iCurToastyTrigger++;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ class ScoreKeeperNormal: public ScoreKeeper
|
|||||||
int m_iMaxScoreSoFar; // for nonstop scoring
|
int m_iMaxScoreSoFar; // for nonstop scoring
|
||||||
int m_iPointBonus; // the difference to award at the end
|
int m_iPointBonus; // the difference to award at the end
|
||||||
int m_iCurToastyCombo;
|
int m_iCurToastyCombo;
|
||||||
int m_iCurToastyTrigger;
|
//int m_iCurToastyTrigger;
|
||||||
int m_iNextToastyAt;
|
//int m_iNextToastyAt;
|
||||||
bool m_bIsLastSongInCourse;
|
bool m_bIsLastSongInCourse;
|
||||||
bool m_bIsBeginner;
|
bool m_bIsBeginner;
|
||||||
|
|
||||||
@@ -60,7 +60,8 @@ class ScoreKeeperNormal: public ScoreKeeper
|
|||||||
ThemeMetric<float> m_QuadPlusNoteMultiplier;
|
ThemeMetric<float> m_QuadPlusNoteMultiplier;
|
||||||
ThemeMetric<float> m_CustomComboMultiplier;
|
ThemeMetric<float> m_CustomComboMultiplier;
|
||||||
|
|
||||||
ThemeMetric<LuaReference> m_vToastyTriggers;
|
//ThemeMetric<LuaReference> m_vToastyTriggers;
|
||||||
|
ThemeMetric<int> m_ToastyTrigger;
|
||||||
|
|
||||||
vector<Steps*> m_apSteps;
|
vector<Steps*> m_apSteps;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user