diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/GenericSequencing.h index 3fd9b5865b..9489c53f8f 100644 --- 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 index 1e520fb326..5cf4dbe094 100644 --- a/src/Etterna/MinaCalc/MinaCalc.cpp +++ b/src/Etterna/MinaCalc/MinaCalc.cpp @@ -178,6 +178,10 @@ Calc::CalcMain(const std::vector& 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,7 +290,7 @@ inline auto JackStamAdjust(const float x, Calc& calc, const int hi) -> std::vector { // 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; @@ -294,7 +298,7 @@ JackStamAdjust(const float x, Calc& calc, const int hi) -> std::vector 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 doot(diff.size()); @@ -499,7 +503,7 @@ Calc::InitializeHands(const std::vector& 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 index 5a79fff190..e7cf3f36e5 100644 --- 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 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";