From e14cb3ce6e63ae817230bc69e2303eadf568dbf0 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 19:25:55 -0400 Subject: [PATCH 01/11] new branch: sm124futures. So far: Have both description and author credit be filled in from a .sm file. --- src/NotesLoaderSM.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp index 9b3b3e9ff8..d2ec3c749d 100644 --- a/src/NotesLoaderSM.cpp +++ b/src/NotesLoaderSM.cpp @@ -37,6 +37,7 @@ void SMLoader::LoadFromSMTokens( // insert stepstype hacks from GameManager.cpp here? -aj out.m_StepsType = GAMEMAN->StringToStepsType( sStepsType ); out.SetDescription( sDescription ); + out.SetCredit( sDescription ); // this is often used for both. out.SetDifficulty( DwiCompatibleStringToDifficulty(sDifficulty) ); // Handle hacks that originated back when StepMania didn't have From c4351290782cb4cdb94656990a81584165247cd4 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 19:35:57 -0400 Subject: [PATCH 02/11] sm124futures: Allow choosing which field to use. Either the #DESCRIPTION or #CREDIT tag can be used for SM files. By default, the old behavior is still used. --- Themes/_fallback/metrics.ini | 3 +++ src/NotesWriterSM.cpp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 18418ebc07..9072a6269f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -647,6 +647,9 @@ LyricBackChangedCommand=LyricCommand,"Back" InLength=0 OutLength=0 +[NotesWriterSM] +DescriptionUsesCreditField=false + [OptionRow] ShowModIcons=false ShowUnderlines=true diff --git a/src/NotesWriterSM.cpp b/src/NotesWriterSM.cpp index df1ac5e87d..af3855a78c 100644 --- a/src/NotesWriterSM.cpp +++ b/src/NotesWriterSM.cpp @@ -15,6 +15,9 @@ #include "RageUtil.h" #include "Song.h" #include "Steps.h" +#include "ThemeMetric.h" + +ThemeMetric USE_CREDIT ( "NotesWriterSM", "DescriptionUsesCreditField" ); /** * @brief Turn the BackgroundChange into a string. @@ -268,7 +271,8 @@ static RString GetSMNotesTag( const Song &song, const Steps &in ) GAMEMAN->GetStepsTypeInfo(in.m_StepsType).szName, SmEscape(in.GetDescription()).c_str()) ); lines.push_back( song.m_vsKeysoundFile.empty() ? "#NOTES:" : "#NOTES2:" ); lines.push_back( ssprintf( " %s:", GAMEMAN->GetStepsTypeInfo(in.m_StepsType).szName ) ); - lines.push_back( ssprintf( " %s:", SmEscape(in.GetDescription()).c_str() ) ); + RString desc = (USE_CREDIT ? in.GetCredit() : in.GetDescription()); + lines.push_back( ssprintf( " %s:", SmEscape(desc).c_str() ) ); lines.push_back( ssprintf( " %s:", DifficultyToString(in.GetDifficulty()).c_str() ) ); lines.push_back( ssprintf( " %d:", in.GetMeter() ) ); From c661650956ade60847c38db587bc84b494079c6e Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 19:37:41 -0400 Subject: [PATCH 03/11] sm124futures: changelog. --- Docs/Changelog_sm-ssc.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 7be1d02092..29fa2edf1f 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -9,6 +9,15 @@ Not all changes are documented, for various reasons. supported but exist anyways.) _____________________________________________________________________________ +================================================================================ +sm-ssc v1.2.4 | 20110??? +-------------------------------------------------------------------------------- + +20110313 +-------- +* [NotesWriterSM] Allow for either the #DESCRIPTION or #CREDIT tags to be used + for the .sm format's description token. [Wolfman2000] + ================================================================================ sm-ssc v1.2.3 | 201103?? -------------------------------------------------------------------------------- From cec55f1aeda2f6dc9cfbc897e7c203f47bad4dc1 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 19:47:39 -0400 Subject: [PATCH 04/11] sm124futures: doxygen for the next version. --- src/Player.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Player.cpp b/src/Player.cpp index cc2d2fafa2..ffd130e238 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -175,8 +175,15 @@ ThemeMetric REQUIRE_STEP_ON_MINES ( "Player", "RequireStepOnMines" ); * For those wishing to make a theme very accurate to In The Groove 2, set this to false. */ ThemeMetric ROLL_BODY_INCREMENTS_COMBO ( "Player", "RollBodyIncrementsCombo" ); ThemeMetric CHECKPOINTS_TAPS_SEPARATE_JUDGMENT ( "Player", "CheckpointsTapsSeparateJudgment" ); -ThemeMetric SCORE_MISSED_HOLDS_AND_ROLLS ( "Player", "ScoreMissedHoldsAndRolls" ); // sm-ssc addition +/** + * @brief Do we score missed holds and rolls with HoldNoteScores? + * + * If set to true, missed holds and rolls are given LetGo judgments. + * If set to false, missed holds and rolls are given no judgment on the hold side of things. */ +ThemeMetric SCORE_MISSED_HOLDS_AND_ROLLS ( "Player", "ScoreMissedHoldsAndRolls" ); +/** @brief How much of the song/course must have gone by before a Player's combo is colored? */ ThemeMetric PERCENT_UNTIL_COLOR_COMBO ( "Player", "PercentUntilColorCombo" ); +/** @brief How much combo must be earned before the announcer says "Combo Stopped"? */ ThemeMetric COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" ); ThemeMetric ATTACK_RUN_TIME_RANDOM ( "Player", "AttackRunTimeRandom" ); ThemeMetric ATTACK_RUN_TIME_MINE ( "Player", "AttackRunTimeMine" ); From e988bba855c016d5735bff76cbf79e3abcb93fca Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 20:03:54 -0400 Subject: [PATCH 05/11] sm124futures: Enhanced editor stuff in progress. Cycle between the different types of Tap Notes. Hold/Roll heads do not count on this. Obviously still being worked on, but the code compiles at this point. --- Themes/_fallback/Languages/en.ini | 1 + src/ScreenEdit.cpp | 4 ++++ src/ScreenEdit.h | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 984de88fc7..64d49a73a8 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1925,6 +1925,7 @@ Insert beat and shift down=Insert beat and shift down Shift BPM changes and stops down one beat=Shift BPM changes and stops down one beat Delete beat and shift up=Delete beat and shift up Shift BPM changes and stops up one beat=Shift BPM changes and stops up one beat +Cycle between tap notes=Cycle between tap notes Lay mine=Lay mine Lay lift=Lay lift Add to/remove from right half=Add to/remove from right half diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 5fba445970..7e50cc8faf 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -269,6 +269,9 @@ void ScreenEdit::InitEditMappings() // m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_TAP_ATTACK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT); m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL); + + m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_LEFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cn); + m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_RIGHT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cm); m_EditMappingsDeviceInput.button [EDIT_BUTTON_SCROLL_SPEED_UP][0] = DeviceInput(DEVICE_KEYBOARD, KEY_UP); m_EditMappingsDeviceInput.hold[EDIT_BUTTON_SCROLL_SPEED_UP][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); @@ -4035,6 +4038,7 @@ static const EditHelpLine g_EditHelpLines[] = EditHelpLine( "Shift BPM changes and stops down one beat", EDIT_BUTTON_INSERT_SHIFT_PAUSES ), EditHelpLine( "Delete beat and shift up", EDIT_BUTTON_DELETE ), EditHelpLine( "Shift BPM changes and stops up one beat", EDIT_BUTTON_DELETE_SHIFT_PAUSES ), + EditHelpLine( "Cycle between tap notes", EDIT_BUTTON_CYCLE_TAP_LEFT, EDIT_BUTTON_CYCLE_TAP_RIGHT ), EditHelpLine( "Lay mine", EDIT_BUTTON_LAY_MINE_OR_ROLL ), EditHelpLine( "Lay lift", EDIT_BUTTON_LAY_LIFT ), EditHelpLine( "Add to/remove from right half", EDIT_BUTTON_RIGHT_SIDE ), diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index f32e6940ac..d68d2dafd4 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -54,6 +54,10 @@ enum EditButton EDIT_BUTTON_LAY_TAP_ATTACK, EDIT_BUTTON_LAY_LIFT, EDIT_BUTTON_REMOVE_NOTE, + + // These are modifiers to change the present tap note. + EDIT_BUTTON_CYCLE_TAP_LEFT, + EDIT_BUTTON_CYCLE_TAP_RIGHT, EDIT_BUTTON_SCROLL_UP_LINE, EDIT_BUTTON_SCROLL_UP_PAGE, From ca1bd8345d62f0e4af2db0756af02ccca354b852 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 20:52:03 -0400 Subject: [PATCH 06/11] sm124futures: Add TapNoteType to string function. This will be needed for the Editor. --- src/NoteTypes.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/NoteTypes.h b/src/NoteTypes.h index 9bee6d5b54..7fd893a230 100644 --- a/src/NoteTypes.h +++ b/src/NoteTypes.h @@ -204,6 +204,10 @@ extern TapNote TAP_ORIGINAL_FAKE; // 'F' extern TapNote TAP_ADDITION_TAP; extern TapNote TAP_ADDITION_MINE; +const RString& TapNoteTypeToString( TapNote::Type tn ); +const RString& TapNoteTypeToLocalizedString( TapNote::Type tn ); +LuaDeclareType( TapNote::Type ); + /** * @brief The number of tracks allowed. * From 8d42e1827cf24ee68ce45fe8da74094ee02af92e Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 20:58:08 -0400 Subject: [PATCH 07/11] sm124futures: prepare the .ini files. --- Themes/_fallback/Languages/en.ini | 1 + Themes/_fallback/metrics.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 64d49a73a8..c25622c8a6 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1244,6 +1244,7 @@ Description=Description Chart Style=Chart Style Main title=Main title Subtitle=Subtitle +Tap Note=Tap Note Tap Steps=Tap Steps Jumps=Jumps Hands=Hands diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 9072a6269f..3fc779c3b6 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3652,6 +3652,7 @@ DescriptionFormat="%s:\n %s\n" ChartStyleFormat="%s:\n %s\n" MainTitleFormat="%s:\n %s\n" SubtitleFormat="%s:\n %s\n" +TapNoteTypeFormat="%s: %s\n" NumStepsFormat="%s: %d\n" NumJumpsFormat="%s: %d\n" NumHoldsFormat="%s: %d\n" From f951a8706801fecedc32296fe3eeece7d2b67c72 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 22:24:43 -0400 Subject: [PATCH 08/11] sm124futures: Working tap note cycling. The code in NoteTypes could use a review: perhaps the Type definition should be taken out of the struct to try to make it more consistent? --- src/NoteTypes.h | 25 +++++++++++++++++++--- src/ScreenEdit.cpp | 53 ++++++++++++++++++++++++++++------------------ src/ScreenEdit.h | 4 ++++ 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/NoteTypes.h b/src/NoteTypes.h index 7fd893a230..4c23f1576f 100644 --- a/src/NoteTypes.h +++ b/src/NoteTypes.h @@ -204,9 +204,28 @@ extern TapNote TAP_ORIGINAL_FAKE; // 'F' extern TapNote TAP_ADDITION_TAP; extern TapNote TAP_ADDITION_MINE; -const RString& TapNoteTypeToString( TapNote::Type tn ); -const RString& TapNoteTypeToLocalizedString( TapNote::Type tn ); -LuaDeclareType( TapNote::Type ); +/** + * @brief Retrieve the string representing the TapNote Type. + * + * TODO: Find a way to standardize this with the other enum string calls. + * @param tn the TapNote's type. + * @return the intended string. */ +inline const RString TapNoteTypeToString( TapNote::Type tn ) +{ + switch( tn ) + { + case TapNote::empty: return RString("empty"); + case TapNote::tap: return RString("tap"); + case TapNote::hold_head: return RString("hold_head"); + case TapNote::hold_tail: return RString("hold_tail"); + case TapNote::mine: return RString("mine"); + case TapNote::lift: return RString("lift"); + case TapNote::attack: return RString("attack"); + case TapNote::autoKeysound: return RString("autoKeysound"); + case TapNote::fake: return RString("fake"); + default: return RString(); + } +} /** * @brief The number of tracks allowed. diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 7e50cc8faf..7a9d0cf0c1 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -16,6 +16,7 @@ #include "LocalizedString.h" #include "NoteDataUtil.h" #include "NoteSkinManager.h" +#include "NoteTypes.h" #include "NotesWriterSM.h" #include "PrefsManager.h" #include "RageSoundManager.h" @@ -733,6 +734,8 @@ void ScreenEdit::Init() m_pSteps = GAMESTATE->m_pCurSteps[PLAYER_1]; m_bReturnToRecordMenuAfterPlay = false; m_fBeatToReturnTo = 0; + + m_selectedTap = TAP_ORIGINAL_TAP; GAMESTATE->m_bGameplayLeadIn.Set( true ); GAMESTATE->m_EditMode = EDIT_MODE.GetValue(); @@ -1027,6 +1030,7 @@ static LocalizedString DESCRIPTION("ScreenEdit", "Description"); static LocalizedString CHART_STYLE("ScreenEdit", "Chart Style"); static LocalizedString MAIN_TITLE("ScreenEdit", "Main title"); static LocalizedString SUBTITLE("ScreenEdit", "Subtitle"); +static LocalizedString TAP_NOTE_TYPE("ScreenEdit", "Tap Note"); static LocalizedString TAP_STEPS("ScreenEdit", "Tap Steps"); static LocalizedString JUMPS("ScreenEdit", "Jumps"); static LocalizedString HANDS("ScreenEdit", "Hands"); @@ -1051,6 +1055,7 @@ static ThemeMetric DESCRIPTION_FORMAT("ScreenEdit", "DescriptionFormat" static ThemeMetric CHART_STYLE_FORMAT("ScreenEdit", "ChartStyleFormat"); static ThemeMetric MAIN_TITLE_FORMAT("ScreenEdit", "MainTitleFormat"); static ThemeMetric SUBTITLE_FORMAT("ScreenEdit", "SubtitleFormat"); +static ThemeMetric TAP_NOTE_TYPE_FORMAT("ScreenEdit", "TapNoteTypeFormat"); static ThemeMetric NUM_STEPS_FORMAT("ScreenEdit", "NumStepsFormat"); static ThemeMetric NUM_JUMPS_FORMAT("ScreenEdit", "NumJumpsFormat"); static ThemeMetric NUM_HOLDS_FORMAT("ScreenEdit", "NumHoldsFormat"); @@ -1119,6 +1124,7 @@ void ScreenEdit::UpdateTextInfo() sText += ssprintf( MAIN_TITLE_FORMAT.GetValue(), MAIN_TITLE.GetValue().c_str(), m_pSong->m_sMainTitle.c_str() ); if( m_pSong->m_sSubTitle.size() ) sText += ssprintf( SUBTITLE_FORMAT.GetValue(), SUBTITLE.GetValue().c_str(), m_pSong->m_sSubTitle.c_str() ); + sText += ssprintf( TAP_NOTE_TYPE_FORMAT.GetValue(), TAP_NOTE_TYPE.GetValue().c_str(), TapNoteTypeToString( m_selectedTap.type ).c_str() ); break; } sText += ssprintf( NUM_STEPS_FORMAT.GetValue(), TAP_STEPS.GetValue().c_str(), m_NoteDataEdit.GetNumTapNotes() ); @@ -1299,43 +1305,48 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB ) m_NoteDataEdit.SetTapNote( iCol, iSongIndex, TAP_EMPTY ); // Don't CheckNumberOfNotesAndUndo. We don't want to revert any change that removes notes. } - else if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ) - { - m_soundAddNote.Play(); - SetDirty( true ); - SaveUndo(); - TapNote tn = TAP_ORIGINAL_MINE; - tn.pn = m_InputPlayerNumber; - m_NoteDataEdit.SetTapNote( iCol, iSongIndex, tn ); - CheckNumberOfNotesAndUndo(); - } else if( EditIsBeingPressed(EDIT_BUTTON_LAY_TAP_ATTACK) ) { g_iLastInsertTapAttackTrack = iCol; EditMiniMenu( &g_InsertTapAttack, SM_BackFromInsertTapAttack ); } - else if( EditIsBeingPressed(EDIT_BUTTON_LAY_LIFT) ) - { - m_soundAddNote.Play(); - SetDirty( true ); - SaveUndo(); - TapNote tn = TAP_ORIGINAL_LIFT; - tn.pn = m_InputPlayerNumber; - m_NoteDataEdit.SetTapNote( iCol, iSongIndex, tn ); - CheckNumberOfNotesAndUndo(); - } else { m_soundAddNote.Play(); SetDirty( true ); SaveUndo(); - TapNote tn = TAP_ORIGINAL_TAP; + TapNote tn = m_selectedTap; tn.pn = m_InputPlayerNumber; m_NoteDataEdit.SetTapNote(iCol, iSongIndex, tn ); CheckNumberOfNotesAndUndo(); } } break; + + case EDIT_BUTTON_CYCLE_TAP_LEFT: + { + switch ( m_selectedTap.type ) + { + case TapNote::tap: m_selectedTap = TAP_ORIGINAL_FAKE; break; + case TapNote::mine: m_selectedTap = TAP_ORIGINAL_TAP; break; + case TapNote::lift: m_selectedTap = TAP_ORIGINAL_MINE; break; + case TapNote::fake: m_selectedTap = TAP_ORIGINAL_LIFT; break; + DEFAULT_FAIL( m_selectedTap.type ); + } + break; + } + case EDIT_BUTTON_CYCLE_TAP_RIGHT: + { + switch ( m_selectedTap.type ) + { + case TapNote::tap: m_selectedTap = TAP_ORIGINAL_MINE; break; + case TapNote::mine: m_selectedTap = TAP_ORIGINAL_LIFT; break; + case TapNote::lift: m_selectedTap = TAP_ORIGINAL_FAKE; break; + case TapNote::fake: m_selectedTap = TAP_ORIGINAL_TAP; break; + DEFAULT_FAIL( m_selectedTap.type ); + } + break; + } case EDIT_BUTTON_SCROLL_SPEED_UP: case EDIT_BUTTON_SCROLL_SPEED_DOWN: { diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index d68d2dafd4..fae15b9f5b 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -9,6 +9,7 @@ #include "Background.h" #include "Foreground.h" #include "NoteField.h" +#include "NoteTypes.h" #include "Song.h" #include "Steps.h" #include "ThemeMetric.h" @@ -236,6 +237,9 @@ protected: SnapDisplay m_SnapDisplay; BitmapText m_textInputTips; + + /** @brief The current TapNote that would be inserted. */ + TapNote m_selectedTap; void UpdateTextInfo(); BitmapText m_textInfo; // status information that changes From 247782b7260ab2a6a25369e7aa0a863f5f55af14 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 22:45:19 -0400 Subject: [PATCH 09/11] sm124futures: simplify attempt. Caveat: recording mode is back to basics: taps and holds. If demand is high, this can be restored. --- src/ScreenEdit.cpp | 20 +++++--------------- src/ScreenEdit.h | 3 +-- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 7a9d0cf0c1..2920784b4b 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -266,10 +266,8 @@ void ScreenEdit::InitEditMappings() m_EditMappingsDeviceInput.button[EDIT_BUTTON_RIGHT_SIDE][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LALT); m_EditMappingsDeviceInput.button[EDIT_BUTTON_RIGHT_SIDE][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RALT); - m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_MINE_OR_ROLL][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT); + m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_ROLL][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT); // m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_TAP_ATTACK][0] = DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT); - m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); - m_EditMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL); m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_LEFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cn); m_EditMappingsDeviceInput.button[EDIT_BUTTON_CYCLE_TAP_RIGHT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_Cm); @@ -331,10 +329,8 @@ void ScreenEdit::InitEditMappings() m_PlayMappingsDeviceInput.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC); m_PlayMappingsMenuButton.button[EDIT_BUTTON_RETURN_TO_EDIT][1] = GAME_BUTTON_BACK; - m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_MINE_OR_ROLL][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT); - m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_MINE_OR_ROLL][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT); - m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL); - m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_LIFT][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL); + m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_ROLL][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT); + m_RecordMappingsDeviceInput.button[EDIT_BUTTON_LAY_ROLL][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT); m_RecordMappingsDeviceInput.button[EDIT_BUTTON_REMOVE_NOTE][0] = DeviceInput(DEVICE_KEYBOARD, KEY_LALT); m_RecordMappingsDeviceInput.button[EDIT_BUTTON_REMOVE_NOTE][1] = DeviceInput(DEVICE_KEYBOARD, KEY_RALT); m_RecordMappingsDeviceInput.button[EDIT_BUTTON_RETURN_TO_EDIT][0] = DeviceInput(DEVICE_KEYBOARD, KEY_ESC); @@ -960,7 +956,7 @@ void ScreenEdit::Update( float fDeltaTime ) else if( fSecsHeld > RECORD_HOLD_SECONDS ) { // create or extend a hold or roll note - TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ? TAP_ORIGINAL_ROLL_HEAD: TAP_ORIGINAL_HOLD_HEAD; + TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_ROLL) ? TAP_ORIGINAL_ROLL_HEAD: TAP_ORIGINAL_HOLD_HEAD; tn.pn = m_InputPlayerNumber; m_NoteDataRecord.AddHoldNote( t, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat), tn ); @@ -2120,10 +2116,6 @@ void ScreenEdit::InputRecord( const InputEventPlus &input, EditButton EditB ) m_NoteDataRecord.SetTapNote( iCol, iHeadRow, TAP_EMPTY ); TapNote tn = TAP_ORIGINAL_TAP; - if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ) - tn = TAP_ORIGINAL_MINE; - else if( EditIsBeingPressed(EDIT_BUTTON_LAY_LIFT) ) - tn = TAP_ORIGINAL_LIFT; tn.pn = m_InputPlayerNumber; m_NoteDataRecord.SetTapNote( iCol, iRow, tn ); m_NoteFieldRecord.Step( iCol, TNS_W1 ); @@ -2516,7 +2508,7 @@ void ScreenEdit::ScrollTo( float fDestinationBeat ) // Don't SaveUndo. We want to undo the whole hold, not just the last segment // that the user made. Dragging the hold bigger can only absorb and remove // other taps, so dragging won't cause us to exceed the note limit. - TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_MINE_OR_ROLL) ? TAP_ORIGINAL_ROLL_HEAD : TAP_ORIGINAL_HOLD_HEAD; + TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_ROLL) ? TAP_ORIGINAL_ROLL_HEAD : TAP_ORIGINAL_HOLD_HEAD; tn.pn = m_InputPlayerNumber; m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, tn ); @@ -4050,8 +4042,6 @@ static const EditHelpLine g_EditHelpLines[] = EditHelpLine( "Delete beat and shift up", EDIT_BUTTON_DELETE ), EditHelpLine( "Shift BPM changes and stops up one beat", EDIT_BUTTON_DELETE_SHIFT_PAUSES ), EditHelpLine( "Cycle between tap notes", EDIT_BUTTON_CYCLE_TAP_LEFT, EDIT_BUTTON_CYCLE_TAP_RIGHT ), - EditHelpLine( "Lay mine", EDIT_BUTTON_LAY_MINE_OR_ROLL ), - EditHelpLine( "Lay lift", EDIT_BUTTON_LAY_LIFT ), EditHelpLine( "Add to/remove from right half", EDIT_BUTTON_RIGHT_SIDE ), EditHelpLine( "Switch player (Routine only)", EDIT_BUTTON_SWITCH_PLAYERS ), }; diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h index fae15b9f5b..fe77602a96 100644 --- a/src/ScreenEdit.h +++ b/src/ScreenEdit.h @@ -51,9 +51,8 @@ enum EditButton // These are modifiers to EDIT_BUTTON_COLUMN_*. EDIT_BUTTON_RIGHT_SIDE, - EDIT_BUTTON_LAY_MINE_OR_ROLL, + EDIT_BUTTON_LAY_ROLL, EDIT_BUTTON_LAY_TAP_ATTACK, - EDIT_BUTTON_LAY_LIFT, EDIT_BUTTON_REMOVE_NOTE, // These are modifiers to change the present tap note. From 17299dd3be7e8d0736882bc5dfd7832ecd494d98 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 22:56:30 -0400 Subject: [PATCH 10/11] sm124futures: add directions to make rolls. We may want to see about breaking this one up. --- Themes/_fallback/Languages/en.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index c25622c8a6..7314f129ad 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1223,7 +1223,7 @@ Enter a new sub title transliteration.=Enter a new sub title transliteration. Enter a new sub title.=Enter a new sub title. More than %d notes per measure is not allowed. This change has been reverted.=More than %d notes per measure is not allowed. This change has been reverted. No backgrounds available=No backgrounds available -EditHelpText=Up/Down:\n change beat\nLeft/Right:\n change snap\nNumber keys:\n add/remove\n tap note\nCreate hold note:\n Hold a number\n while moving\n Up or Down\nSpace bar:\n Set area\n marker\nEnter:\n Area Menu\nEscape:\n Main Menu\nF1:\n Show help\n +EditHelpText=Up/Down:\n change beat\nLeft/Right:\n change snap\nNumber keys:\n add/remove\n tap note\nCreate hold note:\n Hold a number\n while moving\n Up or Down\nCreate roll note:\n Hold Shift,\n then create a\n hold note.\nSpace bar:\n Set area\n marker\nEnter:\n Area Menu\nEscape:\n Main Menu\nF1:\n Show help\n PlayRecordHelpText=Press START to end Save successful.=Save successful. Saved as SM and DWI.=Saved as SM and DWI. From 297c1943bf048f20583177038c768267d901d35c Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 13 Mar 2011 22:57:38 -0400 Subject: [PATCH 11/11] sm124futures: changelog. --- Docs/Changelog_sm-ssc.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 29fa2edf1f..9f5cfa6b44 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -17,6 +17,8 @@ sm-ssc v1.2.4 | 20110??? -------- * [NotesWriterSM] Allow for either the #DESCRIPTION or #CREDIT tags to be used for the .sm format's description token. [Wolfman2000] +* [ScreenEdit] Add Tap Note Cycling to allow inputting all of the taps. The way + to make holds and rolls are still the same as before. [Wolfman2000] ================================================================================ sm-ssc v1.2.3 | 201103??