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

phase out separate course difficulty names

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-07 22:49:04 +00:00
parent b4102e79c6
commit 4ccea4e87b
15 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir
+1
View File
@@ -0,0 +1 @@
_blank
stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir
+1
View File
@@ -0,0 +1 @@
_blank
stepmania/Themes/default/Languages/de.ini
+2 -2
View File
@@ -52,10 +52,10 @@ StepMania=StepMania
[CourseDifficulty]
Beginner=ANFÄNGER
Challenge=HERAUSFORDERUNG
Difficult=SCHWER
Hard=SCHWER
Easy=LEICHT
Edit=EDIT
Regular=NORMAL
Medium=NORMAL
[CourseEntryType]
Best=Spielerrekord
stepmania/Themes/default/Languages/en.ini
+2 -2
View File
@@ -40,10 +40,10 @@ StepMania=StepMania
[CourseDifficulty]
Beginner=BEGINNER
Challenge=CHALLENGE
Difficult=DIFFICULT
Hard=DIFFICULT
Easy=EASY
Edit=EDIT
Regular=REGULAR
Medium=REGULAR
[CourseEntryType]
Best=Players' Best
stepmania/Themes/default/Languages/es.ini
+2 -2
View File
@@ -51,10 +51,10 @@ StepMania=StepMania
[CourseDifficulty]
Beginner=PRINCIPIANTE
Challenge=DESAFÍO
Difficult=DIFÍCIL
Hard=DIFÍCIL
Easy=FÁCIL
Edit=INTRODUCIR NOMBRE
Regular=INTERMEDIO
Medium=INTERMEDIO
[CourseEntryType]
Best=Favoritas de los Jugadores
stepmania/Themes/default/Languages/fr.ini
+2 -2
View File
@@ -52,10 +52,10 @@ StepMania=StepMania
[CourseDifficulty]
Beginner=DEBUTANT
Challenge=CHALLENGE
Difficult=DIFFICILE
Hard=DIFFICILE
Easy=FACILE
Edit=EDIT
Regular=NORMAL
Medium=NORMAL
[CourseEntryType]
Best=Chanson favorite
stepmania/Themes/default/Languages/it.ini
+2 -2
View File
@@ -52,10 +52,10 @@ StepMania=Stepmania
[CourseDifficulty]
Beginner=PRINCIPIANTI
Challenge=CHALLENGE
Difficult=DIFFICILE
Hard=DIFFICILE
Easy=FACILE
Edit=EDIT
Regular=NORMALE
Medium=NORMALE
[CourseEntryType]
Best=Preferite dai giocatori
stepmania/Themes/default/metrics.ini
+1 -1
View File
@@ -9,7 +9,7 @@ FirstAttractScreen="ScreenCompany"
DefaultModifiers="default"
DefaultCpuModifiers=""
DifficultiesToShow="beginner,easy,medium,hard,challenge"
CourseDifficultiesToShow="easy,regular,difficult"
CourseDifficultiesToShow="easy,medium,hard"
StepsTypesToHide="dance-couple,dance-solo,pump-halfdouble,lights-cabinet"
ScreenWidth=640
ScreenHeight=480
stepmania/src/CatalogXml.cpp
+1 -1
View File
@@ -281,7 +281,7 @@ void CatalogXml::Save( LoadingWindow *loading_window )
XNode* pNode2 = pNode->AppendChild( "CourseDifficulty" );
FOREACH_CONST( CourseDifficulty, CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW.GetValue(), iter )
{
XNode* pNode3 = pNode2->AppendChild( "CourseDifficulty", CourseDifficultyToString(*iter) );
XNode* pNode3 = pNode2->AppendChild( "CourseDifficulty", DifficultyToString(*iter) );
pNode3->AppendAttr( "DisplayAs", CourseDifficultyToLocalizedString(*iter) );
}
}
stepmania/src/Difficulty.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ const RString &CourseDifficultyToLocalizedString( CourseDifficulty x )
{
for( unsigned i = 0; i < NUM_CourseDifficulty; ++i )
{
auto_ptr<LocalizedString> ap( new LocalizedString("CourseDifficulty", CourseDifficultyToString((CourseDifficulty)i)) );
auto_ptr<LocalizedString> ap( new LocalizedString("CourseDifficulty", DifficultyToString((CourseDifficulty)i)) );
g_CourseDifficultyName[i] = ap;
}
}
stepmania/src/GameCommand.cpp
+1 -1
View File
@@ -296,7 +296,7 @@ void GameCommand::LoadOne( const Command& cmd )
if( pCourse == NULL || pStyle == NULL )
RageException::Throw( "Must set Course and Style to set Steps." );
const CourseDifficulty cd = StringToCourseDifficulty( sTrail );
const CourseDifficulty cd = StringToDifficulty( sTrail );
ASSERT_M( cd != Difficulty_Invalid, ssprintf("Invalid difficulty '%s'", sTrail.c_str()) );
m_pTrail = pCourse->GetTrail( pStyle->m_StepsType, cd );
stepmania/src/Profile.cpp
+2 -2
View File
@@ -991,7 +991,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const
pGeneralDataNode->AppendChild( "Guid", m_sGuid );
pGeneralDataNode->AppendChild( "SortOrder", SortOrderToString(m_SortOrder) );
pGeneralDataNode->AppendChild( "LastDifficulty", DifficultyToString(m_LastDifficulty) );
pGeneralDataNode->AppendChild( "LastCourseDifficulty", CourseDifficultyToString(m_LastCourseDifficulty) );
pGeneralDataNode->AppendChild( "LastCourseDifficulty", DifficultyToString(m_LastCourseDifficulty) );
pGeneralDataNode->AppendChild( m_lastSong.CreateNode() );
pGeneralDataNode->AppendChild( m_lastCourse.CreateNode() );
pGeneralDataNode->AppendChild( "TotalPlays", m_iTotalPlays );
@@ -1153,7 +1153,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
pNode->GetChildValue( "Guid", m_sGuid );
pNode->GetChildValue( "SortOrder", s ); m_SortOrder = StringToSortOrder( s );
pNode->GetChildValue( "LastDifficulty", s ); m_LastDifficulty = StringToDifficulty( s );
pNode->GetChildValue( "LastCourseDifficulty", s ); m_LastCourseDifficulty = StringToCourseDifficulty( s );
pNode->GetChildValue( "LastCourseDifficulty", s ); m_LastCourseDifficulty = StringToDifficulty( s );
pTemp = pNode->GetChild( "Song" ); if( pTemp ) m_lastSong.LoadFromNode( pTemp );
pTemp = pNode->GetChild( "Course" ); if( pTemp ) m_lastCourse.LoadFromNode( pTemp );
pNode->GetChildValue( "TotalPlays", m_iTotalPlays );
stepmania/src/ScreenOptionsManageCourses.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ static void SetNextCombination()
GAMESTATE->m_cdEdit.Set( curVal.cd );
// XXX Testing.
SCREENMAN->SystemMessage( ssprintf("%s, %s", GAMEMAN->StepsTypeToString(curVal.st).c_str(),
CourseDifficultyToString(curVal.cd).c_str()) );
DifficultyToString(curVal.cd).c_str()) );
RefreshTrail();
}
stepmania/src/ScreenRanking.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void ScreenRankingScroller::Init()
if( m_PageType == PageType_AllSteps )
m_sprDifficulty[*d].Load( THEME->GetPathG(m_sName,"difficulty "+DifficultyToString(*d)) );
else
m_sprDifficulty[*d].Load( THEME->GetPathG(m_sName,"CourseDifficulty "+CourseDifficultyToString(*d)) );
m_sprDifficulty[*d].Load( THEME->GetPathG(m_sName,"CourseDifficulty "+DifficultyToString(*d)) );
m_sprDifficulty[*d]->SetName( "Difficulty"+DifficultyToString(*d) );
m_sprDifficulty[*d]->SetXY( DIFFICULTY_X(*d), DIFFICULTY_Y );
this->AddChild( m_sprDifficulty[*d] );
stepmania/src/TrailUtil.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ XNode* TrailID::CreateNode() const
XNode* pNode = new XNode( "Trail" );
pNode->AppendAttr( "StepsType", GameManager::StepsTypeToString(st) );
pNode->AppendAttr( "CourseDifficulty", CourseDifficultyToString(cd) );
pNode->AppendAttr( "CourseDifficulty", DifficultyToString(cd) );
return pNode;
}
@@ -54,13 +54,13 @@ void TrailID::LoadFromNode( const XNode* pNode )
st = GameManager::StringToStepsType( sTemp );
pNode->GetAttrValue("CourseDifficulty", sTemp);
cd = StringToCourseDifficulty( sTemp );
cd = StringToDifficulty( sTemp );
}
RString TrailID::ToString() const
{
RString s = GameManager::StepsTypeToString(st);
s += " " + CourseDifficultyToString(cd);
s += " " + DifficultyToString(cd);
return s;
}