rip pure runman farm by dragging diff towards tc | 460

this is kind of a bandaid. BUT - to not remove all runningmen by killing its scaling altogether, compromise by letting extreme overrated rm detection exist, and then scale it back towards the tc instead of applying some additional arbitrary scalar

Author: poco0317

src/Etterna/MinaCalc/Dependent/HD_PatternMods/RunningMan.h

@@ -32,6 +32,11 @@ struct RunningManMod
 	float offhand_tap_prop_max = 1.F;
 	float offhand_tap_prop_base = 1.7F;
 
+	float offhand_tap_prop_anch_diff_base = 1.2F;
+	float offhand_tap_prop_anch_diff_scaler = 1.1F;
+	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;
 	float off_tap_same_prop_max = 1.25F;
@@ -71,6 +76,11 @@ struct RunningManMod
 		{ "offhand_tap_prop_max", &offhand_tap_prop_max },
 		{ "offhand_tap_prop_base", &offhand_tap_prop_base },
 
+		{ "offhand_tap_prop_anch_diff_base", &offhand_tap_prop_anch_diff_base },
+		{ "offhand_tap_prop_anch_diff_scaler", &offhand_tap_prop_anch_diff_scaler },
+		{ "offhand_tap_prop_anch_diff_min", &offhand_tap_prop_anch_diff_min },
+		{ "offhand_tap_prop_anch_diff_max", &offhand_tap_prop_anch_diff_max },
+
 		{ "off_tap_same_prop_scaler", &off_tap_same_prop_scaler },
 		{ "off_tap_same_prop_min", &off_tap_same_prop_min },
 		{ "off_tap_same_prop_max", &off_tap_same_prop_max },
@@ -171,10 +181,14 @@ struct RunningManMod
 		 * as well- this is called immediately after advance_sequencing, so
 		 * we've already determined which sequence to use as rm */
 
-		float oht_p = 1.5F - (highest_rm._rm.get_offhand_tap_prop() *
-							  offhand_tap_prop_scaler);
+		float oht_p = offhand_tap_prop_anch_diff_base -
+					  (highest_rm._rm.get_offhand_tap_prop() *
+					   offhand_tap_prop_anch_diff_scaler);
+
+		oht_p = std::clamp(oht_p,
+						   offhand_tap_prop_anch_diff_min,
+						   offhand_tap_prop_anch_diff_max);
 
-		oht_p = std::clamp(oht_p, 0.75F, 1.0F);
 		return highest_rm.get_difficulty() * oht_p;
 	}
 

src/Etterna/MinaCalc/MinaCalc.cpp

@@ -986,7 +986,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 459;
+int mina_calc_version = 460;
 auto
 GetCalcVersion() -> int
 {

src/Etterna/MinaCalc/SequencedBaseDiffCalc.h

@@ -101,11 +101,20 @@ struct techyo
 	{
 		// for now do simple thing, for this interval either use the higher
 		// between weighted adjusted ms/nps base and runningman diff
-		// we definitely don't want to average here because we don't want tech
+		// we definitely don't want to pure average here because we don't want tech
 		// to only be files with strong runningman pattern detection, but we
 		// could probably do something more robust at some point
-		return std::max(weighted_average(get_tc_base(calc), nps_base, 4.F, 9.F),
-						rm_itv_max_diff);
+		auto tc = weighted_average(get_tc_base(calc), nps_base, 4.F, 9.F);
+		auto rm = rm_itv_max_diff;
+		if (rm >= tc) {
+			// for rm dominant intervals, use tc to drag diff down
+			// weight should be [0,1]
+			// 1 -> all rm
+			// 0 -> all tc
+			constexpr float weight = 0.6F;
+			rm = weighted_average(rm, tc, weight, 1.F);
+		}
+		return std::max(tc, rm);
 	}
 
 	void interval_end()