From 4ecde8a3da08dbcbc2d846678b2b775234ec1ec7 Mon Sep 17 00:00:00 2001
From: Barinade <poco0317@users.noreply.github.com>
Date: Thu, 28 Nov 2019 21:30:36 -0600
Subject: [PATCH] Remove RandomAttacks references & a couple of Attack-related
 things

still left the player options and a couple of tiny things in for compatibility sake (mod charts im thinking about you every day)
---
 Data/RandomAttacks.txt                    | 54 -----------------------
 src/Etterna/Actor/Gameplay/NoteField.h    |  4 --
 src/Etterna/Models/Misc/PlayerInfo.h      |  1 -
 src/Etterna/Models/StepsAndStyles/Steps.h |  5 ---
 src/Etterna/Singletons/SongManager.cpp    |  2 -
 5 files changed, 66 deletions(-)
 delete mode 100644 Data/RandomAttacks.txt

diff --git a/Data/RandomAttacks.txt b/Data/RandomAttacks.txt
deleted file mode 100644
index 6c54536b68..0000000000
--- a/Data/RandomAttacks.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// File for specifying Random Attacks, used by the Random Attacks mod and Attack Mines mod.
-//
-// Sample lines:
-// #ATTACK:drunk;
-// #ATTACK:30% tornado;
-// #ATTACK:-20% beat;
-
-// Speed Mods
-#ATTACK:0.5x;
-#ATTACK:1x;
-#ATTACK:1.5x;
-#ATTACK:2x;
-
-// Accel Mods
-#ATTACK:boost;
-#ATTACK:brake;
-#ATTACK:wave;
-#ATTACK:expand;
-
-// Effect Mods
-#ATTACK:drunk;
-#ATTACK:dizzy;
-#ATTACK:confusion;
-#ATTACK:65% mini;
-#ATTACK:20% flip;
-#ATTACK:30% invert;
-#ATTACK:30% tornado;
-#ATTACK:tipsy;
-#ATTACK:beat;
-#ATTACK:bumpy;
-
-// Appearance Mods
-#ATTACK:50% hidden;
-#ATTACK:50% sudden;
-#ATTACK:30% blink;
-
-// Hide Mods
-#ATTACK:dark;
-#ATTACK:blind;
-
-// Transform Mods
-#ATTACK:mines;
-
-// Scroll
-#ATTACK:30% reverse;
-#ATTACK:reverse;
-#ATTACK:centered;
-
-// Perspective Mods
-#ATTACK:hallway;
-#ATTACK:space;
-#ATTACK:incoming;
-#ATTACK:overhead;
-#ATTACK:distant;
\ No newline at end of file
diff --git a/src/Etterna/Actor/Gameplay/NoteField.h b/src/Etterna/Actor/Gameplay/NoteField.h
index 7a9c45e095..ad589c2d6b 100644
--- a/src/Etterna/Actor/Gameplay/NoteField.h
+++ b/src/Etterna/Actor/Gameplay/NoteField.h
@@ -9,7 +9,6 @@
 #include "Etterna/Actor/Gameplay/ReceptorArrowRow.h"
 #include "Etterna/Actor/Base/Sprite.h"
 
-struct Attack;
 class NoteData;
 /** @brief An Actor that renders NoteData. */
 class NoteField : public ActorFrame
@@ -99,9 +98,6 @@ class NoteField : public ActorFrame
 								  float horiz_align,
 								  const RageColor& color,
 								  const RageColor& glow);
-	void DrawAttackText(float beat,
-						const Attack& attack,
-						const RageColor& glow);
 	void DrawBGChangeText(float beat,
 						  RString new_bg_name,
 						  const RageColor& glow);
diff --git a/src/Etterna/Models/Misc/PlayerInfo.h b/src/Etterna/Models/Misc/PlayerInfo.h
index 771d63d0f9..3c0ca42136 100644
--- a/src/Etterna/Models/Misc/PlayerInfo.h
+++ b/src/Etterna/Models/Misc/PlayerInfo.h
@@ -88,7 +88,6 @@ class PlayerInfo
 	ScoreKeeper* m_pPrimaryScoreKeeper;
 	/** @brief The current PlayerOptions that are activated. */
 	BitmapText* m_ptextPlayerOptions;
-	/** @brief The current attack modifiers that are in play for the moment. */
 
 	/** @brief The NoteData the Player has to get through. */
 	NoteData m_NoteData;
diff --git a/src/Etterna/Models/StepsAndStyles/Steps.h b/src/Etterna/Models/StepsAndStyles/Steps.h
index 476126ed1a..a74f63848d 100644
--- a/src/Etterna/Models/StepsAndStyles/Steps.h
+++ b/src/Etterna/Models/StepsAndStyles/Steps.h
@@ -246,11 +246,6 @@ class Steps
 	 * @return true if it does, or false otherwise. */
 	bool HasSignificantTimingChanges() const;
 
-	/**
-	 * @brief Determine if the Steps have any attacks.
-	 * @return true if it does, or false otherwise. */
-	bool HasAttacks() const;
-
 	const RString GetMusicPath() const; // Returns the path for loading.
 	const RString& GetMusicFile()
 	  const; // Returns the filename for the simfile.
diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp
index b1ab0c7ee1..338c1c4cbd 100644
--- a/src/Etterna/Singletons/SongManager.cpp
+++ b/src/Etterna/Singletons/SongManager.cpp
@@ -52,10 +52,8 @@ struct Group
 SongManager* SONGMAN =
   NULL; // global and accessible from anywhere in our program
 
-/** @brief The file that contains various random attacks. */
 const RString ADDITIONAL_SONGS_DIR = "/AdditionalSongs/";
 const RString EDIT_SUBDIR = "Edits/";
-const RString ATTACK_FILE = "/Data/RandomAttacks.txt";
 
 static const ThemeMetric<RageColor> EXTRA_COLOR("SongManager", "ExtraColor");
 static const ThemeMetric<int> EXTRA_COLOR_METER("SongManager",