don't forget to like, share, and inscribe | 433

etternagame · Jul 15, 2020 · 127d2fb · 127d2fb
1 parent d6521cd
commit 127d2fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 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
 static const float anchor_spacing_buffer_ms = 10.F;
 static const float anchor_speed_increase_cutoff_factor = 2.34F;
-static const int len_cap = 6;
+static const int len_cap = 5;
 
 enum anch_status
 {

diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp
@@ -178,6 +178,10 @@ Calc::CalcMain(const std::vector<NoteInfo>& NoteInfo,
 				// so 50%s on 60s don't give 35s
 				r = downscale_low_accuracy_scores(r, score_goal);
 				r = CalcClamp(r, r, ssrcap);
+
+				if (highest_stam_adjusted_skillset == Skill_JackSpeed) {
+					r = downscale_low_accuracy_scores(r, score_goal);
+				}
 			}
 		}
 
@@ -286,15 +290,15 @@ inline auto
 JackStamAdjust(const float x, Calc& calc, const int hi) -> std::vector<float>
 {
 	// Jack stamina Model params (see above)
-	static const auto stam_ceil = 1.075234F;
+	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_prop = 0.49424F;
 	auto stam_floor = 0.95F;
 	auto mod = 0.95F;
 
 	auto avs2 = 0.F;
-	const auto super_stam_ceil = 1.11F;
+	const auto super_stam_ceil = 1.09F;
 
 	const auto& diff = calc.jack_diff.at(hi);
 	std::vector<float> doot(diff.size());
@@ -499,7 +503,7 @@ Calc::InitializeHands(const std::vector<NoteInfo>& NoteInfo,
  * degree above the actual max points as a cheap hack to water down some of the
  * absurd scaling hs/js/cj had. Note: do not set these values below 1 */
 static const float tech_pbm = 1.F;
-static const float jack_pbm = 1.015F;
+static const float jack_pbm = 1.0175F;
 static const float stream_pbm = 1.01F;
 static const float bad_newbie_skillsets_pbm = 1.05F;
 
@@ -899,7 +903,7 @@ MinaSDCalcDebug(
 	}
 }
 
-int mina_calc_version = 432;
+int mina_calc_version = 433;
 auto
 GetCalcVersion() -> int
 {

diff --git a/src/Etterna/MinaCalc/UlbuAcolytes.h b/src/Etterna/MinaCalc/UlbuAcolytes.h
@@ -10,7 +10,7 @@
  * patterns have lower enps than streams, streams default to 1 and chordstreams
  * start lower, stam is a special case and may use normalizers again */
 static const std::array<float, NUM_Skillset> basescalers = {
-	0.F, 0.93F, 0.885F, 0.84F, 0.925F, 0.88F, 0.8F, 0.83F
+	0.F, 0.93F, 0.885F, 0.84F, 0.925F, 0.91F, 0.8F, 0.83F
 };
 
 static const std::string calc_params_xml = "Save/calc params.xml";