Radar branch. See description. ↓
1) Allow displaying Lift and Fake counts in the Editor. 2) Display the number of Fakes in the music select screen.
This commit is contained in:
@@ -1246,6 +1246,8 @@ Hands=Hands
|
|||||||
Holds=Holds
|
Holds=Holds
|
||||||
Mines=Mines
|
Mines=Mines
|
||||||
Rolls=Rolls
|
Rolls=Rolls
|
||||||
|
Lifts=Lifts
|
||||||
|
Fakes=Fakes
|
||||||
Beat 0 offset=Beat 0 offset
|
Beat 0 offset=Beat 0 offset
|
||||||
Preview Start=Preview Start
|
Preview Start=Preview Start
|
||||||
Preview Length=Preview Length
|
Preview Length=Preview Length
|
||||||
|
|||||||
@@ -3631,6 +3631,8 @@ NumHoldsFormat="%s: %d\n"
|
|||||||
NumMinesFormat="%s: %d\n"
|
NumMinesFormat="%s: %d\n"
|
||||||
NumHandsFormat="%s: %d\n"
|
NumHandsFormat="%s: %d\n"
|
||||||
NumRollsFormat="%s: %d\n"
|
NumRollsFormat="%s: %d\n"
|
||||||
|
NumLiftsFormat="%s: %d\n"
|
||||||
|
NumFakesFormat="%s: %d\n"
|
||||||
Beat0OffsetFormat="%s:\n %.5f secs\n"
|
Beat0OffsetFormat="%s:\n %.5f secs\n"
|
||||||
PreviewStartFormat="%s:\n %.5f secs\n"
|
PreviewStartFormat="%s:\n %.5f secs\n"
|
||||||
PreviewLengthFormat="%s:\n %.5f secs\n"
|
PreviewLengthFormat="%s:\n %.5f secs\n"
|
||||||
|
|||||||
@@ -120,16 +120,16 @@ t[#t+1] = Def.ActorFrame {
|
|||||||
InitCommand=cmd(x,-128+16+8;y,-14+16*3);
|
InitCommand=cmd(x,-128+16+8;y,-14+16*3);
|
||||||
};
|
};
|
||||||
-- Center
|
-- Center
|
||||||
CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Mines' ) .. {
|
CreatePaneDisplayItem( iPN, "MINES", 'RadarCategory_Hands' ) .. {
|
||||||
InitCommand=cmd(x,-128+16+8+74;y,-14);
|
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);
|
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);
|
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);
|
InitCommand=cmd(x,-128+16+8+74;y,-14+16*3);
|
||||||
};
|
};
|
||||||
-- Right
|
-- Right
|
||||||
|
|||||||
@@ -1027,6 +1027,8 @@ static LocalizedString HANDS("ScreenEdit", "Hands");
|
|||||||
static LocalizedString HOLDS("ScreenEdit", "Holds");
|
static LocalizedString HOLDS("ScreenEdit", "Holds");
|
||||||
static LocalizedString MINES("ScreenEdit", "Mines");
|
static LocalizedString MINES("ScreenEdit", "Mines");
|
||||||
static LocalizedString ROLLS("ScreenEdit", "Rolls");
|
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 BEAT_0_OFFSET("ScreenEdit", "Beat 0 offset");
|
||||||
static LocalizedString PREVIEW_START("ScreenEdit", "Preview Start");
|
static LocalizedString PREVIEW_START("ScreenEdit", "Preview Start");
|
||||||
static LocalizedString PREVIEW_LENGTH("ScreenEdit", "Preview Length");
|
static LocalizedString PREVIEW_LENGTH("ScreenEdit", "Preview Length");
|
||||||
@@ -1049,6 +1051,8 @@ static ThemeMetric<RString> NUM_HOLDS_FORMAT("ScreenEdit", "NumHoldsFormat");
|
|||||||
static ThemeMetric<RString> NUM_MINES_FORMAT("ScreenEdit", "NumMinesFormat");
|
static ThemeMetric<RString> NUM_MINES_FORMAT("ScreenEdit", "NumMinesFormat");
|
||||||
static ThemeMetric<RString> NUM_HANDS_FORMAT("ScreenEdit", "NumHandsFormat");
|
static ThemeMetric<RString> NUM_HANDS_FORMAT("ScreenEdit", "NumHandsFormat");
|
||||||
static ThemeMetric<RString> NUM_ROLLS_FORMAT("ScreenEdit", "NumRollsFormat");
|
static ThemeMetric<RString> NUM_ROLLS_FORMAT("ScreenEdit", "NumRollsFormat");
|
||||||
|
static ThemeMetric<RString> NUM_LIFTS_FORMAT("ScreenEdit", "NumLiftsFormat");
|
||||||
|
static ThemeMetric<RString> NUM_FAKES_FORMAT("ScreenEdit", "NumFakesFormat");
|
||||||
static ThemeMetric<RString> BEAT_0_OFFSET_FORMAT("ScreenEdit", "Beat0OffsetFormat");
|
static ThemeMetric<RString> BEAT_0_OFFSET_FORMAT("ScreenEdit", "Beat0OffsetFormat");
|
||||||
static ThemeMetric<RString> PREVIEW_START_FORMAT("ScreenEdit", "PreviewStartFormat");
|
static ThemeMetric<RString> PREVIEW_START_FORMAT("ScreenEdit", "PreviewStartFormat");
|
||||||
static ThemeMetric<RString> PREVIEW_LENGTH_FORMAT("ScreenEdit", "PreviewLengthFormat");
|
static ThemeMetric<RString> 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_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_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_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() )
|
switch( EDIT_MODE.GetValue() )
|
||||||
{
|
{
|
||||||
DEFAULT_FAIL( EDIT_MODE.GetValue() );
|
DEFAULT_FAIL( EDIT_MODE.GetValue() );
|
||||||
|
|||||||
Reference in New Issue
Block a user