do the same thing rop did at the same time

jameskr97 · Jul 13, 2020 · 6a5a06d · 6a5a06d
1 parent 7b047c4
commit 6a5a06d
Show file tree

Hide file tree

Showing 30 changed files with 90 additions and 180 deletions.
diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJ.h
@@ -1,9 +1,5 @@
 #pragma once
-#include <string>
-#include <vector>
-
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
+#include "../../PatternModHelpers.h"
 
 struct CJMod
 {
@@ -34,7 +30,7 @@ struct CJMod
 
 	float vibro_flag = 1.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "mod_base", &mod_base },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h
@@ -1,9 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
+#include "../../PatternModHelpers.h"
 
 struct CJDensityMod
 {
@@ -22,7 +18,7 @@ struct CJDensityMod
 	float hand_scaler = 0.95F;
 	float quad_scaler = 0.95F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "base", &base },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/FlamJam.h
@@ -1,11 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/MinaCalc/Agnostic/HA_Sequencers/FlamSequencing.h"
+#include "../../PatternModHelpers.h"
+#include "../HA_Sequencers/FlamSequencing.h"
 
 // MAKE FLAM WIDE RANGE?
 // ^ YES DO THIS
@@ -23,7 +18,7 @@ struct FlamJamMod
 	float group_tol = 35.F;
 	float step_tol = 17.5F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "scaler", &scaler },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/HS.h
@@ -1,10 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/MinaCalc/Agnostic/MetaIntervalInfo.h"
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
+#include "../../PatternModHelpers.h"
+#include "../MetaIntervalInfo.h"
 
 struct HSMod
 {
@@ -39,7 +35,7 @@ struct HSMod
 
 	float decay_factor = 0.05F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "mod_base", &mod_base },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/JS.h
@@ -1,10 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
+#include "../../PatternModHelpers.h"
 
 struct JSMod
 {
@@ -35,7 +30,7 @@ struct JSMod
 
 	float decay_factor = 0.05F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "mod_base", &mod_base },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/Stream.h
@@ -1,10 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
+#include "../../PatternModHelpers.h"
 
 // since the calc skillset balance now operates on +- rather than
 // just - and then normalization, we will use this to depress the
@@ -28,7 +23,7 @@ struct StreamMod
 
 	float vibro_flag = 1.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "prop_buffer", &prop_buffer },

diff --git a/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h b/src/Etterna/MinaCalc/Agnostic/HA_PatternMods/TheThingFinder.h
@@ -1,10 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/MinaCalc/Agnostic/HA_Sequencers/ThingSequencing.h"
+#include "../../PatternModHelpers.h"
+#include "../HA_Sequencers/ThingSequencing.h"
 
 // the a things, they are there, we must find them...
 // probably add a timing check to this as well
@@ -24,7 +20,7 @@ struct TheThingLookerFinderThing
 	float step_tol = 17.5F;
 	float scaler = 0.2F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "base", &base },
@@ -81,7 +77,7 @@ struct TheThingLookerFinderThing2
 	float step_tol = 17.5F;
 	float scaler = 0.2F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "base", &base },

diff --git a/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h b/src/Etterna/MinaCalc/Agnostic/MetaRowInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "HA_Sequencing.h"
 #include "MetaIntervalInfo.h"
-#include "Etterna/MinaCalc/SequencingHelpers.h"
+#include "../SequencingHelpers.h"
 
 /* counterpart to metahandinfo */
 
@@ -69,7 +69,7 @@ struct metaRowInfo
 				++mitvi.actual_jacks;
 				twas_jack = true;
 				// try to pick up gluts maybe?
-				if (count > 1 && column_count(last_notes) > 1U) {
+				if (count > 1 && column_count(last_notes) > 1) {
 					++mitvi.shared_chord_jacks;
 				}
 			}

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Balance.h
@@ -1,9 +1,5 @@
 #pragma once
-#include <string>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
+#include "../IntervalHandInfo.h"
 
 struct BalanceMod
 {
@@ -19,7 +15,7 @@ struct BalanceMod
 	float scaler = 1.F;
 	float other_scaler = 4.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },   { "max_mod", &max_mod },
 		{ "mod_base", &mod_base }, { "buffer", &buffer },
 		{ "scaler", &scaler },	   { "other_scaler", &other_scaler },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/CJOHJ.h
@@ -1,11 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/MetaIntervalHandInfo.h"
-#include "Etterna/MinaCalc/Dependent/HD_Sequencers/OHJSequencing.h"
+#include "../IntervalHandInfo.h"
+#include "../HD_Sequencers/OHJSequencing.h"
 
 /* initially copied from ohj but the logic should probably be adjusted on
  * multiple levels */

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Chaos.h
@@ -1,10 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/CalcWindow.h"
+#include "../IntervalHandInfo.h"
 
 // slightly different implementation of the old chaos mod, basically picks up
 // polyishness and tries to detect awkward transitions
@@ -20,7 +15,7 @@ struct ChaosMod
 	float max_mod = 1.05F;
 	float base = -0.1F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 		{ "base", &base },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHJ.h
@@ -1,18 +1,10 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/MetaIntervalHandInfo.h"
-#include "Etterna/MinaCalc/Dependent/HD_Sequencers/OHJSequencing.h"
+#include "../MetaIntervalHandInfo.h"
+#include "../HD_Sequencers/OHJSequencing.h"
 
 struct OHJumpModGuyThing
 {
 	const CalcPatternMod _pmod = OHJumpMod;
-	// const vector<CalcPatternMod> _dbg = { OHJBaseProp, OHJPropComp,
-	// OHJSeqComp,
-	//									  OHJMaxSeq,   OHJCCTaps,	OHJHTaps };
 	const std::string name = "OHJumpMod";
 
 #pragma region params
@@ -27,7 +19,7 @@ struct OHJumpModGuyThing
 	float prop_pool = 1.4F;
 	float prop_scaler = 1.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },
 

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/OHT.h
@@ -1,10 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
+#include "../IntervalHandInfo.h"
 
 /* this is complex enough it should probably have its own sequencer, there's
  * also a fair bit of redundancy between this, wrjt, wrr. Currently this has the
@@ -31,7 +26,7 @@ struct OHTrillMod
 	float cv_reset = 1.F;
 	float cv_threshhold = 0.5F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "window_param", &window_param },
 
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/Roll.h
@@ -1,11 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
-#include "Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h"
+#include "../IntervalHandInfo.h"
+#include "../HD_Sequencers/GenericSequencing.h"
 
 static const int max_seq_parts = 4;
 
@@ -43,7 +38,7 @@ struct RollMod
 
 	float cv_reset = 1.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "window_param", &window_param },
 
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h
@@ -1,10 +1,6 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/MinaCalc/PatternModHelpers.h"
-#include "Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h"
+#include "../../PatternModHelpers.h"
+#include "../HD_Sequencers/RMSequencing.h"
 
 /* Unlike other pattern mods runningman sequencing has 2 core purposes, the
  * primary one involves tracking the anchor speed of a runningman sequence and
@@ -60,7 +56,7 @@ struct RunningManMod
 	float max_jack_len = 3.F;
 	float max_anch_len = 5.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 
 		{ "min_mod", &min_mod },
 		{ "max_mod", &max_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/VOHT.h
@@ -1,10 +1,5 @@
 #pragma once
-#include <string>
-#include <array>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
+#include "../IntervalHandInfo.h"
 
 /* retuned oht mod focus tuned to for catching vibro trills like bagatelle */
 

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeAnchor.h
@@ -1,10 +1,6 @@
 #pragma once
-#include <string>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
-#include "Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h"
+#include "../IntervalHandInfo.h"
+#include "../HD_Sequencers/GenericSequencing.h"
 
 // general mod, should maybe make cj specific one
 struct WideRangeAnchorMod
@@ -24,7 +20,7 @@ struct WideRangeAnchorMod
 	float diff_max = 8.F;
 	float scaler = 0.1F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "window_param", &window_param },
 
 		{ "min_mod", &min_mod },

diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/WideRangeBalance.h
@@ -1,9 +1,5 @@
 #pragma once
-#include <string>
-#include <vector>
-
-#include "Etterna/Models/NoteData/NoteDataStructures.h"
-#include "Etterna/MinaCalc/Dependent/IntervalHandInfo.h"
+#include "../IntervalHandInfo.h"
 
 // this should mayb track offhand taps like the old behavior did
 struct WideRangeBalanceMod
@@ -23,7 +19,7 @@ struct WideRangeBalanceMod
 	float scaler = 1.F;
 	float other_scaler = 4.F;
 
-	const vector<std::pair<std::string, float*>> _params{
+	const std::vector<std::pair<std::string, float*>> _params{
 		{ "window_param", &window_param },
 
 		{ "min_mod", &min_mod },