diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index f7c61ddf24..d3561d3f52 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1246,6 +1246,8 @@ Hands=Hands Holds=Holds Mines=Mines Rolls=Rolls +Lifts=Lifts +Fakes=Fakes Beat 0 offset=Beat 0 offset Preview Start=Preview Start Preview Length=Preview Length diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 3bc0718e63..bbfe73a778 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3631,6 +3631,8 @@ NumHoldsFormat="%s: %d\n" NumMinesFormat="%s: %d\n" NumHandsFormat="%s: %d\n" NumRollsFormat="%s: %d\n" +NumLiftsFormat="%s: %d\n" +NumFakesFormat="%s: %d\n" Beat0OffsetFormat="%s:\n %.5f secs\n" PreviewStartFormat="%s:\n %.5f secs\n" PreviewLengthFormat="%s:\n %.5f secs\n" diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index e0277a18df..d3b2e33716 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -120,16 +120,16 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,-128+16+8;y,-14+16*3); }; -- Center - CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Mines' ) .. { + CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Hands' ) .. { InitCommand=cmd(x,-128+16+8+74;y,-14); }; - CreatePaneDisplayItem( iPN, "HANDS", 'RadarCategory_Hands' ) .. { + CreatePaneDisplayItem( iPN, "HANDS", 'RadarCategory_Rolls' ) .. { InitCommand=cmd(x,-128+16+8+74;y,-14+16); }; - CreatePaneDisplayItem( iPN, "ROLLS", 'RadarCategory_Rolls' ) .. { + CreatePaneDisplayItem( iPN, "ROLLS", 'RadarCategory_Lifts' ) .. { InitCommand=cmd(x,-128+16+8+74;y,-14+16*2); }; - CreatePaneDisplayItem( iPN, "LIFTS", 'RadarCategory_Lifts' ) .. { + CreatePaneDisplayItem( iPN, "LIFTS", 'RadarCategory_Fakes' ) .. { InitCommand=cmd(x,-128+16+8+74;y,-14+16*3); }; -- Right diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 2ca5d26235..4f515bcea9 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -1027,6 +1027,8 @@ static LocalizedString HANDS("ScreenEdit", "Hands"); static LocalizedString HOLDS("ScreenEdit", "Holds"); static LocalizedString MINES("ScreenEdit", "Mines"); static LocalizedString ROLLS("ScreenEdit", "Rolls"); +static LocalizedString LIFTS("ScreenEdit", "Lifts"); +static LocalizedString FAKES("ScreenEdit", "Fakes"); static LocalizedString BEAT_0_OFFSET("ScreenEdit", "Beat 0 offset"); static LocalizedString PREVIEW_START("ScreenEdit", "Preview Start"); static LocalizedString PREVIEW_LENGTH("ScreenEdit", "Preview Length"); @@ -1049,6 +1051,8 @@ static ThemeMetric NUM_HOLDS_FORMAT("ScreenEdit", "NumHoldsFormat"); static ThemeMetric NUM_MINES_FORMAT("ScreenEdit", "NumMinesFormat"); static ThemeMetric NUM_HANDS_FORMAT("ScreenEdit", "NumHandsFormat"); static ThemeMetric NUM_ROLLS_FORMAT("ScreenEdit", "NumRollsFormat"); +static ThemeMetric NUM_LIFTS_FORMAT("ScreenEdit", "NumLiftsFormat"); +static ThemeMetric NUM_FAKES_FORMAT("ScreenEdit", "NumFakesFormat"); static ThemeMetric BEAT_0_OFFSET_FORMAT("ScreenEdit", "Beat0OffsetFormat"); static ThemeMetric PREVIEW_START_FORMAT("ScreenEdit", "PreviewStartFormat"); static ThemeMetric PREVIEW_LENGTH_FORMAT("ScreenEdit", "PreviewLengthFormat"); @@ -1117,6 +1121,8 @@ void ScreenEdit::UpdateTextInfo() sText += ssprintf( NUM_HOLDS_FORMAT.GetValue(), HOLDS.GetValue().c_str(), m_NoteDataEdit.GetNumHoldNotes() ); sText += ssprintf( NUM_MINES_FORMAT.GetValue(), MINES.GetValue().c_str(), m_NoteDataEdit.GetNumMines() ); sText += ssprintf( NUM_ROLLS_FORMAT.GetValue(), ROLLS.GetValue().c_str(), m_NoteDataEdit.GetNumRolls() ); + sText += ssprintf( NUM_LIFTS_FORMAT.GetValue(), LIFTS.GetValue().c_str(), m_NoteDataEdit.GetNumLifts() ); + sText += ssprintf( NUM_FAKES_FORMAT.GetValue(), FAKES.GetValue().c_str(), m_NoteDataEdit.GetNumFakes() ); switch( EDIT_MODE.GetValue() ) { DEFAULT_FAIL( EDIT_MODE.GetValue() );