rm tune, heavily scale rm based on length | 487

short burst rm farm dead
jameskr97 · Aug 15, 2022 · f9b9b4f · f9b9b4f
1 parent 85d02e1
commit f9b9b4f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h b/src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h
@@ -32,10 +32,10 @@ struct RunningManMod
 	float offhand_tap_prop_max = 1.F;
 	float offhand_tap_prop_base = 1.7F;
 
-	float offhand_tap_prop_anch_diff_base = 1.27F;
-	float offhand_tap_prop_anch_diff_scaler = 1.42F;
-	float offhand_tap_prop_anch_diff_min = 0.49F;
-	float offhand_tap_prop_anch_diff_max = 0.55F;
+	float offhand_tap_prop_anch_diff_base = 1.7F;
+	float offhand_tap_prop_anch_diff_scaler = 1.2F;
+	float offhand_tap_prop_anch_diff_min = 0.75F;
+	float offhand_tap_prop_anch_diff_max = 1.F;
 
 	float off_tap_same_prop_scaler = 1.F;
 	float off_tap_same_prop_min = 0.F;

diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
@@ -17,7 +17,7 @@
 /****** Relevant to anchors ******/
 constexpr float anchor_spacing_buffer_ms = 10.F;
 constexpr float anchor_speed_increase_cutoff_factor = 2.34F;
-static const int anchor_len_cap = 5;
+static const int anchor_len_cap = 50;
 
 /****** Relevant to jacks ******/
 constexpr float jack_spacing_buffer_ms = 10.F;
@@ -250,6 +250,7 @@ struct Anchor_Sequencing : public Finger_Sequencing
 	}
 
 	/// returns an adjusted MS average value, not converted to nps
+	/// (((currently unused)))
 	inline float get_ms() override
 	{
 		assert(_sc_ms > 0.F);
@@ -260,9 +261,9 @@ struct Anchor_Sequencing : public Finger_Sequencing
 			return _len_cap_ms;
 		}
 
-		static const auto avg_ms_mult = 1.075F;
-		static const auto anchor_time_buffer_ms = 25.F;
-		static const auto min_ms = 82.5F;
+		static const auto avg_ms_mult = 1.F;
+		static const auto anchor_time_buffer_ms = 0.F;
+		static const auto min_ms = 0.F;
 
 		// get total ms
 		const auto total_ms = ms_from(_last, _start);

diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h
@@ -2,7 +2,7 @@
 #include "../HD_MetaSequencing.h"
 #include "../../UlbuAcolytes.h"
 
-static const float rma_diff_scaler = 2.1F * basescalers[Skill_Technical];
+static const float rma_diff_scaler = 1.5F * basescalers[Skill_Technical];
 
 enum rm_behavior
 {
@@ -588,7 +588,10 @@ struct RM_Sequencer
 
 		const auto flool = ms_from(last_anchor_time, _start);
 
-		const auto pule = (flool) / static_cast<float>(_rm._len - 1);
+		const auto len = static_cast<float>(_rm._len);
+		const auto len_1 = static_cast<float>(_rm._len - 1);
+
+		const auto pule = (flool / len_1) * (len / len_1);
 		const auto drool = ms_to_scaled_nps(pule) * rma_diff_scaler;
 		return drool;
 	}

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -1012,7 +1012,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 486;
+int mina_calc_version = 487;
 auto
 GetCalcVersion() -> int
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1012,7 +1012,7 @@ MinaSDCalcDebug( @@
     	}
     }
-    int mina_calc_version = 486;
+    int mina_calc_version = 487;
     auto
     GetCalcVersion() -> int
     {
@@ Expand Down @@