Added MinTNSToHideNotes preference.

Docs/Changelog_sm5.txt

@@ -4,28 +4,32 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2014/11/19
+----------
+* [Preferences] MinTNSToHideNotes preference added. [kyzentun]
+
 2014/11/15
 ----------
 * [Preferences] Default Fail Type preference mechanism changed internally again.
-  Set your Default Fail Type preference again.
+  Set your Default Fail Type preference again. [kyzentun]
 
 2014/11/05
 ----------
-* [ScreenPrompt] Answer OnCommand metrics fixed to actually work.
+* [ScreenPrompt] Answer OnCommand metrics fixed to actually work. [kyzentun]
 
 2014/11/01
 ----------
-* [RollingNumbers] Cropping and color during tweens fixed.
+* [RollingNumbers] Cropping and color during tweens fixed. [kyzentun]
 
 2014/10/23
 ----------
-* [Global] approach, multiapproach, lerp, and lerp_color lua functions added.
+* [Global] approach, multiapproach, lerp, and lerp_color lua functions added. [kyzentun]
 
 2014/10/20
 ----------
-* [StageStats] GetStepsSeconds function added.
+* [StageStats] GetStepsSeconds function added. [kyzentun]
 * [Steps] If an unrecognized step type is saved, preserve that step instead of
-  deleting it. A warning will be placed in the log file during song load.
+  deleting it. A warning will be placed in the log file during song load.  [kyzentun]
 
 ================================================================================
 StepMania 5.0 beta 4a | 20141015

Themes/_fallback/Languages/en.ini

@@ -414,6 +414,7 @@ HighResolutionTextures=Choose whether high resolution textures (if supported by
 MaxTextureResolution=Choose the maximum texture resolution.  Setting this to anything below 1024 will cause some textures to appear blurry, but may increase your frame rate.
 MenuTimer=When &oq;ON&cq;, menus have a time limit.
 Mines=Mines
+MinTNSToHideNotes=The judgment to achieve for a note to disappear after being hit.
 MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel.
 MovieColorDepth=Choose the color depth of movies. 32 bit textures use more memory, but look nicer.
 MusicWheelSwitchSpeed=Adjusts the speed of the music wheel.
@@ -802,6 +803,17 @@ Three Key Menu=Three Key
 Tiny=Tiny
 Tipsy=Tipsy
 Title Only=Title Only
+TNS_None=TNS_None
+TNS_HitMine=TNS_HitMine
+TNS_AvoidMine=TNS_AvoidMine
+TNS_CheckpointMiss=TNS_CheckpointMiss
+TNS_Miss=TNS_Miss
+TNS_W5=TNS_W5
+TNS_W4=TNS_W4
+TNS_W3=TNS_W3
+TNS_W2=TNS_W2
+TNS_W1=TNS_W1
+TNS_CheckpointHit=TNS_CheckpointHit
 Tornado=Tornado
 Total Feet=Total Feet
 Twirl=Twirl
@@ -1013,6 +1025,7 @@ MenuTimer=Menu Timer
 Meter=Meter
 Min BPM=Min Specified BPM
 Mines=Mines
+MinTNSToHideNotes=HideNote Judgment
 Mirror Player 1 to 2=Mirror P1's notes to P2 (routine only)
 Mirror Player 2 to 1=Mirror P2's notes to P1 (routine only)
 Modify Keysounds at current beat=Modify keysounds at current beat

Themes/_fallback/metrics.ini

@@ -3001,13 +3001,14 @@ Line20="conf,VisualDelaySeconds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="3,4,8,SI,SM,11,13,14,15,16,28,29,30,31"
+LineNames="3,4,8,SI,SM,HN,11,13,14,15,16,28,29,30,31"
 #LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
 Line8="conf,DefaultFailType"
 LineSI="lua,SpeedModIncSize()"
 LineSM="lua,SpeedModIncLarge()"
+LineHN="conf,MinTNSToHideNotes"
 Line11="conf,AllowW1"
 Line13="conf,HiddenSongs"
 Line14="conf,EasterEggs"

src/GameConstantsAndTypes.cpp

@@ -227,6 +227,16 @@ TapNoteScore StringToTapNoteScore( const RString &s )
 
 	return TapNoteScore_Invalid;
 }
+// This is necessary because the StringToX macro wasn't used, and Preference
+// relies on there being a StringConversion entry for enums used in prefs. -Kyz
+namespace StringConversion
+{
+	template<> bool FromString<TapNoteScore>(const RString& value, TapNoteScore& out)
+	{
+		out= StringToTapNoteScore(value);
+		return out != TapNoteScore_Invalid;
+	}
+}
 XToLocalizedString( TapNoteScore );
 LuaFunction( TapNoteScoreToLocalizedString, TapNoteScoreToLocalizedString(Enum::Check<TapNoteScore>(L, 1)) );
 

src/Player.cpp

@@ -2563,7 +2563,7 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b
 				const bool bBright = ( m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo > int(BRIGHT_GHOST_COMBO_THRESHOLD) ) || bBlind;
 				if( m_pNoteField )
 					m_pNoteField->DidTapNote( col, bBlind? TNS_W1:score, bBright );
-				if( score >= TNS_W3 || bBlind )
+				if( score >= PREFSMAN->m_MinTNSToHideNotes || bBlind )
 					HideNote( col, iRowOfOverlappingNoteOrRow );
 			}
 		}
@@ -2909,7 +2909,7 @@ void Player::FlashGhostRow( int iRow )
 			continue;
 		if( m_pNoteField )
 			m_pNoteField->DidTapNote( iTrack, lastTNS, bBright );
-		if( lastTNS >= TNS_W3 || bBlind )
+		if( lastTNS >= PREFSMAN->m_MinTNSToHideNotes || bBlind )
 			HideNote( iTrack, iRow );
 	}
 }

src/PrefsManager.cpp

@@ -221,6 +221,7 @@ PrefsManager::PrefsManager() :
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
 	m_bComboContinuesBetweenSongs	( "ComboContinuesBetweenSongs",	false ),
+	m_MinTNSToHideNotes("MinTNSToHideNotes", TNS_W3),
 	m_ShowSongOptions		( "ShowSongOptions",		Maybe_NO ),
 	m_bDancePointsForOni		( "DancePointsForOni",		true ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),

src/PrefsManager.h

@@ -213,6 +213,7 @@ public:
 	Preference<int>	m_iSongsPerPlay;
 	Preference<bool>	m_bDelayedCreditsReconcile; // zuh?
 	Preference<bool>	m_bComboContinuesBetweenSongs;
+	Preference<TapNoteScore> m_MinTNSToHideNotes;
 	Preference<Maybe>	m_ShowSongOptions;
 	Preference<bool>	m_bDancePointsForOni;
 	Preference<bool>	m_bPercentageScoring;

src/ScreenOptionsMasterPrefs.cpp

@@ -744,6 +744,8 @@ static void InitializeConfOptions()
 	ADD( ConfOption( "ShowSongOptions",		MovePref<Maybe>,	"Ask", "Hide","Show" ) );
 	ADD( ConfOption( "PercentageScoring",	MovePref<bool>,	"Off","On" ) );
 	ADD( ConfOption( "GetRankingName",		MovePref<GetRankingName>, "Off", "On", "Ranking Songs" ) );
+	ADD( ConfOption( "MinTNSToHideNotes", MovePref<TapNoteScore>, "TNS_None", "TNS_HitMine", "TNS_AvoidMine", "TNS_CheckpointMiss", "TNS_Miss", "TNS_W5", "TNS_W4", "TNS_W3", "TNS_W2", "TNS_W1", "TNS_CheckpointHit"));
+
 
 	// Graphic options
 	ADD( ConfOption( "Windowed",			MovePref<bool>,		"Full Screen", "Windowed" ) );