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

award name cleanup

Browse Source
This commit is contained in:
Chris Danford
2008-08-20 05:56:11 +00:00
parent 105d3db246
commit 3711ae0380
7 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.cpp
+19 -19
View File
@@ -271,7 +271,7 @@ static const char *MemoryCardStateNames[] = {
XToString( MemoryCardState );
LuaXType( MemoryCardState );
static const char *PerDifficultyAwardNames[] = {
static const char *StageAwardNames[] = {
"FullComboW3",
"SingleDigitW3",
"OneW3",
@@ -279,31 +279,31 @@ static const char *PerDifficultyAwardNames[] = {
"SingleDigitW2",
"OneW2",
"FullComboW1",
"Percent80W3",
"Percent90W3",
"Percent100W3",
"80PercentW3",
"90PercentW3",
"100PercentW3",
};
XToString( PerDifficultyAward );
XToLocalizedString( PerDifficultyAward );
StringToX( PerDifficultyAward );
LuaFunction( PerDifficultyAwardToLocalizedString, PerDifficultyAwardToLocalizedString(Enum::Check<PerDifficultyAward>(L, 1)) );
LuaXType( PerDifficultyAward );
XToString( StageAward );
XToLocalizedString( StageAward );
StringToX( StageAward );
LuaFunction( StageAwardToLocalizedString, StageAwardToLocalizedString(Enum::Check<StageAward>(L, 1)) );
LuaXType( StageAward );
// Numbers are intentially not at the front of these strings so that the
// strings can be used as XML entity names.
// Numbers are intentially not at the back so that "1000" and "10000" don't
// conflict when searching for theme elements.
static const char *PeakComboAwardNames[] = {
"Peak1000Combo",
"Peak2000Combo",
"Peak3000Combo",
"Peak4000Combo",
"Peak5000Combo",
"Peak6000Combo",
"Peak7000Combo",
"Peak8000Combo",
"Peak9000Combo",
"Peak10000Combo",
"1000",
"2000",
"3000",
"4000",
"5000",
"6000",
"7000",
"8000",
"9000",
"10000",
};
XToString( PeakComboAward );
XToLocalizedString( PeakComboAward );
stepmania/src/GameConstantsAndTypes.h
+27 -27
View File
@@ -368,39 +368,39 @@ LuaDeclareType( Premium );
// Award stuff
//
enum PerDifficultyAward
enum StageAward
{
AWARD_FULL_COMBO_W3,
AWARD_SINGLE_DIGIT_W3,
AWARD_ONE_W3,
AWARD_FULL_COMBO_W2,
AWARD_SINGLE_DIGIT_W2,
AWARD_ONE_W2,
AWARD_FULL_COMBO_W1,
AWARD_PERCENT_80_W3,
AWARD_PERCENT_90_W3,
AWARD_PERCENT_100_W3,
NUM_PerDifficultyAward,
PerDifficultyAward_Invalid,
StageAward_FullComboW3,
StageAward_SingleDigitW3,
StageAward_OneW3,
StageAward_FullComboW2,
StageAward_SingleDigitW2,
StageAward_OneW2,
StageAward_FullComboW1,
StageAward_80PercentW3,
StageAward_90PercentW3,
StageAward_100PercentW3,
NUM_StageAward,
StageAward_Invalid,
};
const RString& PerDifficultyAwardToString( PerDifficultyAward pma );
const RString& PerDifficultyAwardToLocalizedString( PerDifficultyAward pma );
PerDifficultyAward StringToPerDifficultyAward( const RString& pma );
LuaDeclareType( PerDifficultyAward );
const RString& StageAwardToString( StageAward pma );
const RString& StageAwardToLocalizedString( StageAward pma );
StageAward StringToStageAward( const RString& pma );
LuaDeclareType( StageAward );
enum PeakComboAward
{
AWARD_1000_PEAK_COMBO,
AWARD_2000_PEAK_COMBO,
AWARD_3000_PEAK_COMBO,
AWARD_4000_PEAK_COMBO,
AWARD_5000_PEAK_COMBO,
AWARD_6000_PEAK_COMBO,
AWARD_7000_PEAK_COMBO,
AWARD_8000_PEAK_COMBO,
AWARD_9000_PEAK_COMBO,
AWARD_10000_PEAK_COMBO,
PeakComboAward_1000,
PeakComboAward_2000,
PeakComboAward_3000,
PeakComboAward_4000,
PeakComboAward_5000,
PeakComboAward_6000,
PeakComboAward_7000,
PeakComboAward_8000,
PeakComboAward_9000,
PeakComboAward_10000,
NUM_PeakComboAward,
PeakComboAward_Invalid,
};
stepmania/src/GameState.cpp
+1 -1
View File
@@ -895,7 +895,7 @@ void GameState::ResetStageStatistics()
FOREACH_PlayerNumber( p )
{
m_vLastPerDifficultyAwards[p].clear();
m_vLastStageAwards[p].clear();
m_vLastPeakComboAwards[p].clear();
}
stepmania/src/GameState.h
+1 -1
View File
@@ -286,7 +286,7 @@ public:
// Award stuff
//
// lowest priority in front, highest priority at the back.
deque<PerDifficultyAward> m_vLastPerDifficultyAwards[NUM_PLAYERS];
deque<StageAward> m_vLastStageAwards[NUM_PLAYERS];
deque<PeakComboAward> m_vLastPeakComboAwards[NUM_PLAYERS];
stepmania/src/PlayerStageStats.cpp
+21 -21
View File
@@ -55,8 +55,8 @@ void PlayerStageStats::Init()
m_fFirstSecond = FLT_MAX;
m_fLastSecond = 0;
m_pdaToShow = PerDifficultyAward_Invalid;
m_pcaToShow = PeakComboAward_Invalid;
m_StageAward = StageAward_Invalid;
m_PeakComboAward = PeakComboAward_Invalid;
m_iPersonalHighScoreIndex = -1;
m_iMachineHighScoreIndex = -1;
m_bDisqualified = false;
@@ -568,12 +568,12 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
{
LOG->Trace( "hand out awards" );
m_pcaToShow = PeakComboAward_Invalid;
m_PeakComboAward = PeakComboAward_Invalid;
if( bGaveUp || bUsedAutoplay )
return;
deque<PerDifficultyAward> &vPdas = GAMESTATE->m_vLastPerDifficultyAwards[p];
deque<StageAward> &vPdas = GAMESTATE->m_vLastStageAwards[p];
LOG->Trace( "per difficulty awards" );
@@ -582,28 +582,28 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
if( !IsDisqualified() )
{
if( FullComboOfScore( TNS_W3 ) )
vPdas.push_back( AWARD_FULL_COMBO_W3 );
vPdas.push_back( StageAward_FullComboW3 );
if( SingleDigitsOfScore( TNS_W3 ) )
vPdas.push_back( AWARD_SINGLE_DIGIT_W3 );
vPdas.push_back( StageAward_SingleDigitW3 );
if( FullComboOfScore( TNS_W2 ) )
vPdas.push_back( AWARD_FULL_COMBO_W2 );
vPdas.push_back( StageAward_FullComboW2 );
if( SingleDigitsOfScore( TNS_W2 ) )
vPdas.push_back( AWARD_SINGLE_DIGIT_W2 );
vPdas.push_back( StageAward_SingleDigitW2 );
if( FullComboOfScore( TNS_W1 ) )
vPdas.push_back( AWARD_FULL_COMBO_W1 );
vPdas.push_back( StageAward_FullComboW1 );
if( OneOfScore( TNS_W3 ) )
vPdas.push_back( AWARD_ONE_W3 );
vPdas.push_back( StageAward_OneW3 );
if( OneOfScore( TNS_W2 ) )
vPdas.push_back( AWARD_ONE_W2 );
vPdas.push_back( StageAward_OneW2 );
float fPercentW3s = GetPercentageOfTaps( TNS_W3 );
if( fPercentW3s >= 0.8f )
vPdas.push_back( AWARD_PERCENT_80_W3 );
vPdas.push_back( StageAward_80PercentW3 );
if( fPercentW3s >= 0.9f )
vPdas.push_back( AWARD_PERCENT_90_W3 );
vPdas.push_back( StageAward_90PercentW3 );
if( fPercentW3s >= 1.f )
vPdas.push_back( AWARD_PERCENT_100_W3 );
vPdas.push_back( StageAward_100PercentW3 );
}
// Max one PDA per stage
@@ -611,9 +611,9 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
vPdas.erase( vPdas.begin(), vPdas.end()-1 );
if( !vPdas.empty() )
m_pdaToShow = vPdas.back();
m_StageAward = vPdas.back();
else
m_pdaToShow = PerDifficultyAward_Invalid;
m_StageAward = StageAward_Invalid;
LOG->Trace( "done with per difficulty awards" );
@@ -631,9 +631,9 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
}
if( !GAMESTATE->m_vLastPeakComboAwards[p].empty() )
m_pcaToShow = GAMESTATE->m_vLastPeakComboAwards[p].back();
m_PeakComboAward = GAMESTATE->m_vLastPeakComboAwards[p].back();
else
m_pcaToShow = PeakComboAward_Invalid;
m_PeakComboAward = PeakComboAward_Invalid;
LOG->Trace( "done with per combo awards" );
@@ -675,8 +675,8 @@ public:
DEFINE_METHOD( GetLessonScoreNeeded, GetLessonScoreNeeded() )
DEFINE_METHOD( GetPersonalHighScoreIndex, m_iPersonalHighScoreIndex )
DEFINE_METHOD( GetMachineHighScoreIndex, m_iMachineHighScoreIndex )
DEFINE_METHOD( GetPerDifficultyAward, m_pdaToShow )
DEFINE_METHOD( GetPeakComboAward, m_pcaToShow )
DEFINE_METHOD( GetStageAward, m_StageAward )
DEFINE_METHOD( GetPeakComboAward, m_PeakComboAward )
DEFINE_METHOD( IsDisqualified, IsDisqualified() )
static int GetPlayedSteps( T* p, lua_State *L )
@@ -721,7 +721,7 @@ public:
ADD_METHOD( GetLessonScoreNeeded );
ADD_METHOD( GetPersonalHighScoreIndex );
ADD_METHOD( GetMachineHighScoreIndex );
ADD_METHOD( GetPerDifficultyAward );
ADD_METHOD( GetStageAward );
ADD_METHOD( GetPeakComboAward );
ADD_METHOD( IsDisqualified );
ADD_METHOD( GetPlayedSteps );
stepmania/src/PlayerStageStats.h
+2 -2
View File
@@ -107,8 +107,8 @@ public:
// Final results:
void CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutoplay );
PerDifficultyAward m_pdaToShow;
PeakComboAward m_pcaToShow;
StageAward m_StageAward;
PeakComboAward m_PeakComboAward;
int m_iPersonalHighScoreIndex;
int m_iMachineHighScoreIndex;
stepmania/src/ScreenEvaluation.cpp
+3
View File
@@ -176,6 +176,9 @@ void ScreenEvaluation::Init()
ss.m_player[p].m_iScore = rand() % (900*1000*1000);
ss.m_player[p].m_iPersonalHighScoreIndex = (rand() % 3) - 1;
ss.m_player[p].m_iMachineHighScoreIndex = (rand() % 3) - 1;
ss.m_player[p].m_PeakComboAward = (PeakComboAward)(rand()%NUM_PeakComboAward);
ss.m_player[p].m_StageAward = (StageAward)(rand()%NUM_StageAward);
FOREACH_ENUM( RadarCategory, rc )
{
switch( rc )