From 4ccea4e87b004a67228cf8f793ce65e9e4102b06 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 7 Oct 2006 22:49:04 +0000 Subject: [PATCH] phase out separate course difficulty names --- .../Graphics/ScreenRanking CourseDifficulty hard.redir | 1 + .../Graphics/ScreenRanking CourseDifficulty medium.redir | 1 + stepmania/Themes/default/Languages/de.ini | 4 ++-- stepmania/Themes/default/Languages/en.ini | 4 ++-- stepmania/Themes/default/Languages/es.ini | 4 ++-- stepmania/Themes/default/Languages/fr.ini | 4 ++-- stepmania/Themes/default/Languages/it.ini | 4 ++-- stepmania/Themes/default/metrics.ini | 2 +- stepmania/src/CatalogXml.cpp | 2 +- stepmania/src/Difficulty.cpp | 2 +- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/Profile.cpp | 4 ++-- stepmania/src/ScreenOptionsManageCourses.cpp | 2 +- stepmania/src/ScreenRanking.cpp | 2 +- stepmania/src/TrailUtil.cpp | 6 +++--- 15 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir diff --git a/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir b/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty hard.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir b/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenRanking CourseDifficulty medium.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 05232be73b..be0b519832 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -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 diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index d53e0059cb..20887f5874 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -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 diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index 1ad9665bc5..01a1059397 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -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 diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index 032e3922a3..dde76730e0 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -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 diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index e2bc40f976..fe5518df27 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -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 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 54c03a5dd3..52ff1271b5 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -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 diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index 9bf7805240..6541755155 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -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) ); } } diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index bfbd1b68db..8a6c7eedd1 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -69,7 +69,7 @@ const RString &CourseDifficultyToLocalizedString( CourseDifficulty x ) { for( unsigned i = 0; i < NUM_CourseDifficulty; ++i ) { - auto_ptr ap( new LocalizedString("CourseDifficulty", CourseDifficultyToString((CourseDifficulty)i)) ); + auto_ptr ap( new LocalizedString("CourseDifficulty", DifficultyToString((CourseDifficulty)i)) ); g_CourseDifficultyName[i] = ap; } } diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index d80e660d50..f65060fe4f 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -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 ); diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index f902cc6398..e1a70b3b2e 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -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 ); diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp index b97e6ecd81..2d0b8c9c57 100644 --- a/stepmania/src/ScreenOptionsManageCourses.cpp +++ b/stepmania/src/ScreenOptionsManageCourses.cpp @@ -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(); } diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 823aca7b1a..3426e6e7af 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -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] ); diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp index 62af664242..e1302e3a00 100644 --- a/stepmania/src/TrailUtil.cpp +++ b/stepmania/src/TrailUtil.cpp @@ -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; }