kill more attack garb

Author: MinaciousGrace

src/NoteData.cpp

@@ -458,7 +458,6 @@ bool NoteData::IsHoldNoteAtRow( int iTrack, int iRow, int *pHeadRow ) const
 
 		case TapNoteType_Tap:
 		case TapNoteType_Mine:
-		case TapNoteType_Attack:
 		case TapNoteType_Lift:
 		case TapNoteType_Fake:
 			return false;

src/NoteDataUtil.cpp

@@ -630,7 +630,6 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
 						break;
 					case TapNoteType_HoldTail:		c = '3'; break;
 					case TapNoteType_Mine:			c = 'M'; break;
-					case TapNoteType_Attack:			c = 'A'; break;
 					case TapNoteType_AutoKeysound:	c = 'K'; break;
 					case TapNoteType_Lift:			c = 'L'; break;
 					case TapNoteType_Fake:			c = 'F'; break;
@@ -640,11 +639,6 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
 					}
 					sRet.append( 1, c );
 
-					if( tn.type == TapNoteType_Attack )
-					{
-						sRet.append( ssprintf("{%s:%.2f}", tn.sAttackModifiers.c_str(),
-								      tn.fAttackDurationSeconds) );
-					}
 					// hey maybe if we have TapNoteType_Item we can do things here.
 					if( tn.iKeysoundIndex >= 0 )
 						sRet.append( ssprintf("[%d]",tn.iKeysoundIndex) );
@@ -1173,7 +1167,6 @@ void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds,
 				case TapNoteType_Lift:
 					// HoldTails and Attacks are counted by IsTap.  But it doesn't
 					// make sense to count HoldTails as hittable notes. -Kyz
-				case TapNoteType_Attack:
 					++out[RadarCategory_Notes];
 					++state.num_notes_on_curr_row;
 					++total_taps;
@@ -1858,7 +1851,6 @@ static void SuperShuffleTaps( NoteData &inout, int iStartIndex, int iEndIndex )
 				continue;	// skip
 			case TapNoteType_Tap:
 			case TapNoteType_Mine:
-			case TapNoteType_Attack:
 			case TapNoteType_Lift:
 			case TapNoteType_Fake:
 				break;	// shuffle this
@@ -1890,7 +1882,6 @@ static void SuperShuffleTaps( NoteData &inout, int iStartIndex, int iEndIndex )
 				case TapNoteType_Empty:
 				case TapNoteType_Tap:
 				case TapNoteType_Mine:
-				case TapNoteType_Attack:
 				case TapNoteType_Lift:
 				case TapNoteType_Fake:
 					break;	// ok to swap with this
@@ -2990,34 +2981,6 @@ void NoteDataUtil::TransformNoteData( NoteData &nd, TimingData const& timing_dat
 	nd.RevalidateATIs(vector<int>(), false);
 }
 
-void NoteDataUtil::AddTapAttacks( NoteData &nd, Song* pSong )
-{
-	// throw an attack in every 30 seconds
-
-	const char* szAttacks[3] =
-	{
-		"2x",
-		"drunk",
-		"dizzy",
-	};
-
-	for( float sec=15; sec<pSong->m_fMusicLengthSeconds; sec+=30 )
-	{
-		float fBeat = pSong->m_SongTiming.GetBeatFromElapsedTime( sec );
-		int iBeat = (int)fBeat;
-		int iTrack = iBeat % nd.GetNumTracks();	// deterministically calculates track
-		TapNote tn(
-			TapNoteType_Attack,
-			TapNoteSubType_Invalid,
-			TapNoteSource_Original, 
-			szAttacks[RandomInt(ARRAYLEN(szAttacks))],
-			15.0f, 
-			-1 );
-		nd.SetTapNote( iTrack, BeatToNoteRow(fBeat), tn );
-	}
-	nd.RevalidateATIs(vector<int>(), false);
-}
-
 void NoteDataUtil::Scale( NoteData &nd, float fScale )
 {
 	ASSERT( fScale > 0 );

src/NoteDataUtil.h

@@ -165,7 +165,6 @@ namespace NoteDataUtil
 	void TransformNoteData(NoteData &nd, TimingData const& timing_data,
 		const PlayerOptions &po, StepsType st,
 			       int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );
-	void AddTapAttacks( NoteData &nd, Song* pSong );
 
 	void Scale( NoteData &nd, float fScale );
 	void ScaleRegion( NoteData &nd, float fScale, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW );

src/NoteDataWithScoring.cpp

@@ -313,7 +313,6 @@ void NoteDataWithScoring::GetActualRadarValues(const NoteData &in,
 				case TapNoteType_HoldHead:
 					// HoldTails and Attacks are counted by IsTap.  But it doesn't
 					// make sense to count HoldTails as hittable notes. -Kyz
-				case TapNoteType_Attack:
 				case TapNoteType_Lift:
 					UpdateHittable(state.curr_row, first_hittable_row, last_hittable_row);
 					++state.num_notes_on_curr_row;

src/NoteDisplay.cpp

@@ -1504,7 +1504,6 @@ void NoteColumnRenderer::DrawPrimitives()
 			case TapNoteType_HoldTail:
 			case TapNoteType_Mine:
 			case TapNoteType_Lift:
-			case TapNoteType_Attack:
 			case TapNoteType_AutoKeysound:
 			case TapNoteType_Fake:
 				if(!tn.result.bHidden)

src/NoteTypes.cpp

@@ -5,18 +5,17 @@
 #include "XmlFile.h"
 #include "LocalizedString.h"
 
-TapNote TAP_EMPTY	( TapNoteType_Empty,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_TAP	( TapNoteType_Tap,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_LIFT	( TapNoteType_Lift,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_HOLD_HEAD	( TapNoteType_HoldHead,	TapNoteSubType_Hold,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_ROLL_HEAD	( TapNoteType_HoldHead,	TapNoteSubType_Roll,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_MINE	( TapNoteType_Mine,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_ATTACK	( TapNoteType_Attack,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNoteType_AutoKeysound,TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ORIGINAL_FAKE	( TapNoteType_Fake,	TapNoteSubType_Invalid,	TapNoteSource_Original, "", 0, -1 );
-//TapNote TAP_ORIGINAL_MINE_HEAD ( TapNoteType_HoldHead, TapNoteSubType_Mine, TapNoteSource_Original, "", 0, -1 );
-TapNote TAP_ADDITION_TAP	( TapNoteType_Tap,	TapNoteSubType_Invalid,	TapNoteSource_Addition, "", 0, -1 );
-TapNote TAP_ADDITION_MINE	( TapNoteType_Mine,	TapNoteSubType_Invalid,	TapNoteSource_Addition, "", 0, -1 );
+TapNote TAP_EMPTY	( TapNoteType_Empty,	TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_TAP	( TapNoteType_Tap,	TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_LIFT	( TapNoteType_Lift,	TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_HOLD_HEAD	( TapNoteType_HoldHead,	TapNoteSubType_Hold,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_ROLL_HEAD	( TapNoteType_HoldHead,	TapNoteSubType_Roll,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_MINE	( TapNoteType_Mine,	TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_AUTO_KEYSOUND	( TapNoteType_AutoKeysound,TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+TapNote TAP_ORIGINAL_FAKE	( TapNoteType_Fake,	TapNoteSubType_Invalid,	TapNoteSource_Original, -1 );
+//TapNote TAP_ORIGINAL_MINE_HEAD ( TapNoteType_HoldHead, TapNoteSubType_Mine, TapNoteSource_Original, -1 );
+TapNote TAP_ADDITION_TAP	( TapNoteType_Tap,	TapNoteSubType_Invalid,	TapNoteSource_Addition, -1 );
+TapNote TAP_ADDITION_MINE	( TapNoteType_Mine,	TapNoteSubType_Invalid,	TapNoteSource_Addition, -1 );
 
 
 static const char *TapNoteTypeNames[] = {
@@ -26,7 +25,6 @@ static const char *TapNoteTypeNames[] = {
 	"HoldTail",
 	"Mine",
 	"Lift",
-	"Attack",
 	"AutoKeySound",
 	"Fake",
 };
@@ -255,8 +253,6 @@ class LunaTapNote: public Luna<TapNote>
 	DEFINE_METHOD( GetTapNoteSubType, subType );
 	DEFINE_METHOD( GetTapNoteSource, source );
 	DEFINE_METHOD( GetPlayerNumber, pn );
-	DEFINE_METHOD( GetAttackModifiers, sAttackModifiers );
-	DEFINE_METHOD( GetAttackDuration, fAttackDurationSeconds );
 	DEFINE_METHOD( GetKeysoundIndex, iKeysoundIndex );
 	static int GetHoldDuration( T* p, lua_State* L )		{ lua_pushnumber(L, NoteRowToBeat(p->iDuration)); return 1; }
 	static int GetTapNoteResult( T* p, lua_State* L )		{ p->result.PushSelf(L); return 1; }
@@ -269,8 +265,6 @@ class LunaTapNote: public Luna<TapNote>
 		ADD_METHOD( GetTapNoteSource );
 		ADD_METHOD( GetTapNoteResult );
 		ADD_METHOD( GetPlayerNumber );
-		ADD_METHOD( GetAttackModifiers );
-		ADD_METHOD( GetAttackDuration );
 		ADD_METHOD( GetKeysoundIndex );
 		ADD_METHOD( GetHoldDuration );
 		ADD_METHOD( GetHoldNoteResult );

src/NoteTypes.h

@@ -90,7 +90,6 @@ enum TapNoteType
 	TapNoteType_HoldTail,	/**< In 2sand3s mode, holds are deleted and hold_tail is added. */
 	TapNoteType_Mine,		/**< In most modes, it is suggested to not step on these mines. */
 	TapNoteType_Lift,		/**< Lift your foot up when it crosses the target area. */
-	TapNoteType_Attack,		/**< Hitting this note causes an attack to take place. */
 	TapNoteType_AutoKeysound,	/**< A special sound is played when this note crosses the target area. */
 	TapNoteType_Fake,		/**< This arrow can't be scored for or against the player. */
 	NUM_TapNoteType,
@@ -139,10 +138,6 @@ struct TapNote
 	/** @brief The Player that is supposed to hit this note. This is mainly for Routine Mode. */
 	PlayerNumber	pn;
 
-	// used only if Type == attack:
-	RString		sAttackModifiers;
-	float		fAttackDurationSeconds;
-
 	// Index into Song's vector of keysound files if nonnegative:
 	int		iKeysoundIndex;
 
@@ -161,29 +156,23 @@ struct TapNote
 	bool IsNote() const { return type == TapNoteType_Tap || type == TapNoteType_HoldHead; }
 
 	TapNote(): type(TapNoteType_Empty), subType(TapNoteSubType_Invalid),
-		source(TapNoteSource_Original),	result(), pn(PLAYER_INVALID),  sAttackModifiers(""), 
-		fAttackDurationSeconds(0), iKeysoundIndex(-1), iDuration(0), HoldResult() {}
+		source(TapNoteSource_Original),	result(), pn(PLAYER_INVALID), iKeysoundIndex(-1), iDuration(0), HoldResult() {}
 	void Init()
 	{
 		type = TapNoteType_Empty;
 		subType = TapNoteSubType_Invalid; 
 		source = TapNoteSource_Original; 
 		pn = PLAYER_INVALID, 
-		fAttackDurationSeconds = 0.f; 
 		iKeysoundIndex = -1;
 		iDuration = 0;
 	}
 	TapNote( 
 		TapNoteType type_,
 		TapNoteSubType subType_,
-		TapNoteSource source_, 
-		RString sAttackModifiers_,
-		float fAttackDurationSeconds_,
+		TapNoteSource source_,
 		int iKeysoundIndex_ ):
 		type(type_), subType(subType_), source(source_), result(),
-		pn(PLAYER_INVALID), sAttackModifiers(sAttackModifiers_),
-		fAttackDurationSeconds(fAttackDurationSeconds_),
-		iKeysoundIndex(iKeysoundIndex_), iDuration(0), HoldResult()
+		pn(PLAYER_INVALID), iKeysoundIndex(iKeysoundIndex_), iDuration(0), HoldResult()
 	{
 		if (type_ > TapNoteType_Fake )
 		{
@@ -202,8 +191,6 @@ struct TapNote
 		COMPARE(type);
 		COMPARE(subType);
 		COMPARE(source);
-		COMPARE(sAttackModifiers);
-		COMPARE(fAttackDurationSeconds);
 		COMPARE(iKeysoundIndex);
 		COMPARE(iDuration);
 		COMPARE(pn);

src/NotesLoaderJson.cpp

@@ -94,11 +94,6 @@ static void Deserialize( TapNote &o, const Json::Value &root )
 		o.type = (TapNoteType)root["Type"].asInt();
 	//if( o.type == TapNoteType_HoldHead )
 		o.subType = (TapNoteSubType)root["SubType"].asInt();
-	//root["Source"] = (int)source;
-	//if( !o.sAttackModifiers.empty() )
-		o.sAttackModifiers = root["AttackModifiers"].asString();
-	//if( o.fAttackDurationSeconds > 0 )
-		o.fAttackDurationSeconds = (float)root["AttackDurationSeconds"].asDouble();
 	//if( o.bKeysound )
 		o.iKeysoundIndex = root["KeysoundIndex"].asInt();
 	//if( o.iDuration > 0 )

src/NotesWriterJson.cpp

@@ -59,11 +59,6 @@ static void Serialize( const TapNote &o, Json::Value &root )
 		root["Type"] = (int)o.type;
 	if( o.type == TapNoteType_HoldHead )
 		root["SubType"] = (int)o.subType;
-	//root["Source"] = (int)source;
-	if( !o.sAttackModifiers.empty() )
-		root["AttackModifiers"] = o.sAttackModifiers;
-	if( o.fAttackDurationSeconds > 0 )
-		root["AttackDurationSeconds"] = o.fAttackDurationSeconds;
 	if( o.iKeysoundIndex != -1 )
 		root["KeysoundIndex"] = o.iKeysoundIndex;
 	if( o.iDuration > 0 )

src/Player.cpp

@@ -500,7 +500,6 @@ static bool NeedsTapJudging( const TapNote &tn )
 	case TapNoteType_Lift:
 		return tn.result.tns == TNS_None;
 	case TapNoteType_HoldTail:
-	case TapNoteType_Attack:
 	case TapNoteType_AutoKeysound:
 	case TapNoteType_Fake:
 	case TapNoteType_Empty:
@@ -523,7 +522,6 @@ static bool NeedsHoldJudging( const TapNote &tn )
 	case TapNoteType_HoldTail:
 	case TapNoteType_Mine:
 	case TapNoteType_Lift:
-	case TapNoteType_Attack:
 	case TapNoteType_AutoKeysound:
 	case TapNoteType_Fake:
 	case TapNoteType_Empty:
@@ -2053,7 +2051,7 @@ void Player::Step( int col, int row, const std::chrono::steady_clock::time_point
 					score = TNS_HitMine;
 			}
 
-			if( pTN->type == TapNoteType_Attack && score > TNS_W4 )
+			if( score > TNS_W4 )
 				score = TNS_W2; // sentinel
 
 			/* AI will generate misses here. Don't handle a miss like a regular