From 5899f8d39877c76f62f0d0ff3714b63eb352ca81 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 14 Jul 2020 19:15:08 -0400 Subject: [PATCH] it's just like magic | 427 --- .../Dependent/HD_Sequencers/RMSequencing.h | 3 ++- src/Etterna/MinaCalc/MinaCalc.cpp | 14 +++++++------- src/Etterna/MinaCalc/SequencingHelpers.h | 2 +- src/Etterna/MinaCalc/UlbuAcolytes.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h index 116c756280..b5980b438a 100644 --- a/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h +++ b/src/Etterna/MinaCalc/Dependent/HD_Sequencers/RMSequencing.h @@ -1,7 +1,8 @@ #pragma once #include "../HD_MetaSequencing.h" +#include "../../UlbuAcolytes.h" -static const float rma_diff_scaler = 1.21F; +static const float rma_diff_scaler = 1.52F * basescalers[Skill_Technical]; enum rm_behavior { diff --git a/src/Etterna/MinaCalc/MinaCalc.cpp b/src/Etterna/MinaCalc/MinaCalc.cpp index b2907d8e4f..94da7a58df 100644 --- a/src/Etterna/MinaCalc/MinaCalc.cpp +++ b/src/Etterna/MinaCalc/MinaCalc.cpp @@ -315,12 +315,12 @@ JackStamAdjust(const float x, Calc& calc, const int hi) -> std::vector return doot; } -static const float magic_num = 15.F; +static const float magic_num = 16.F; [[nodiscard]] inline auto hit_the_road(const float& x, const float& y) -> float { - return std::max(static_cast(magic_num * erf(0.05F * (y - x))), 0.F); + return std::max(static_cast(magic_num * erf(0.04F * (y - x))), 0.F); } /* ok this is a little jank, we are calculating jack loss looping over the @@ -496,8 +496,8 @@ Calc::InitializeHands(const std::vector& NoteInfo, /* pbm = point buffer multiplier, or basically starting with a max points some * 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.F; +static const float tech_pbm = 1.025F; +static const float jack_pbm = 1.015F; static const float stream_pbm = 1.01F; static const float bad_newbie_skillsets_pbm = 1.05F; @@ -557,12 +557,12 @@ Calc::Chisel(float player_skill, CalcInternal( gotpoints, player_skill, ss, stamina, *this, hi); } - if (ss == Skill_Technical) { + /*if (ss == Skill_Technical) { gotpoints -= fastsqrt(min( max_slap_dash_jack_cap_hack_tech_hat, jackloss(player_skill * 0.6F, *this, hi, stamina) * 0.75F)); - } + }*/ } } } while (gotpoints < reqpoints); @@ -897,7 +897,7 @@ MinaSDCalcDebug( } } -int mina_calc_version = 426; +int mina_calc_version = 427; auto GetCalcVersion() -> int { diff --git a/src/Etterna/MinaCalc/SequencingHelpers.h b/src/Etterna/MinaCalc/SequencingHelpers.h index e1ba40c1fa..e2ebacbedb 100644 --- a/src/Etterna/MinaCalc/SequencingHelpers.h +++ b/src/Etterna/MinaCalc/SequencingHelpers.h @@ -10,7 +10,7 @@ static const float s_init = -5.F; static const float ms_init = 5000.F; // global multiplier to standardize baselines -static const float finalscaler = 3.632F; +static const float finalscaler = 3.632F * 1.025F; inline auto column_count(const unsigned& notes) -> int diff --git a/src/Etterna/MinaCalc/UlbuAcolytes.h b/src/Etterna/MinaCalc/UlbuAcolytes.h index 5abb98e84c..9cb18d0d93 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.82F, 0.925F, 0.87F, 0.8F, 0.84F + 0.F, 0.93F, 0.885F, 0.82F, 0.925F, 0.93F, 0.8F, 0.85F }; static const std::string calc_params_xml = "Save/calc params.xml";