jack reparametertuningization | 452

etternagame · Sep 2, 2021 · 14683bf · 14683bf
1 parent a311167
commit 14683bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h
@@ -17,7 +17,7 @@
 // bpm flux float precision etc
 constexpr float anchor_spacing_buffer_ms = 10.F;
 constexpr float anchor_speed_increase_cutoff_factor = 1.9F;
-static const int len_cap = 5;
+static const int len_cap = 4;
 // ms to pass that definitely means a jack has finished and we started a new one
 constexpr float jack_spacing_buffer_ms = 1000.F;
 

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -303,7 +303,7 @@ JackStamAdjust(const float x, Calc& calc, const int hand)
 	// Jack stamina Model params (see above)
 	static const auto stam_ceil = 1.05234F;
 	static const auto stam_mag = 23.F;
-	static const auto stam_fscale = 2150.F;
+	static const auto stam_fscale = 750.F;
 	static const auto stam_prop = 0.49424F;
 	auto stam_floor = 0.95F;
 	auto mod = 0.95F;
@@ -336,7 +336,7 @@ JackStamAdjust(const float x, Calc& calc, const int hand)
 	return output;
 }
 
-constexpr float magic_num = 16.F;
+constexpr float magic_num = 12.F;
 
 [[nodiscard]] inline auto
 jack_pointloser_func(const float& x, const float& y) -> float
@@ -985,7 +985,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 451;
+int mina_calc_version = 452;
 auto
 GetCalcVersion() -> int
 {