From 762ceb799da43010be271a4108ef0abdcbd9410a Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Thu, 11 Jun 2020 19:28:41 -0400 Subject: [PATCH] tune cj --- src/Etterna/Globals/MinaCalc.cpp | 10 ++++------ .../MinaCalc/Agnostic/HA_PatternMods/CJDensity.h | 12 ++++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Etterna/Globals/MinaCalc.cpp b/src/Etterna/Globals/MinaCalc.cpp index f73bbb5821..875d378ea6 100644 --- a/src/Etterna/Globals/MinaCalc.cpp +++ b/src/Etterna/Globals/MinaCalc.cpp @@ -42,7 +42,7 @@ static const float stam_prop = // and chordstreams start lower // stam is a special case and may use normalizers again static const std::array basescalers = { - 0.F, 0.97F, 0.92F, 0.83F, 0.94F, 0.95F, 0.73F, 1.F + 0.F, 0.97F, 0.92F, 0.83F, 0.94F, 0.95F, 0.83F, 1.F }; void @@ -869,7 +869,7 @@ Hand::InitAdjDiff() }, // chordjack - { CJ, CJDensity, WideRangeAnchor }, + { CJ, CJDensity }, // tech, duNNO wat im DOIN { @@ -967,10 +967,8 @@ Hand::InitAdjDiff() max(fastpow(doot[CJ][i], 2.F), 1.F); break; case Skill_Chordjack: - adj_diff = - soap[CJBase][i] * tp_mods[Skill_Chordjack] * - basescalers[ss] * - CalcClamp(fastsqrt(doot[OHJumpMod][i]) + 0.06F, 0.F, 1.F); + adj_diff = soap[CJBase][i] * tp_mods[Skill_Chordjack] * + basescalers[ss]; break; case Skill_Technical: adj_diff = diff --git a/src/Etterna/Globals/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h b/src/Etterna/Globals/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h index 01fc287f22..0019211893 100644 --- a/src/Etterna/Globals/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h +++ b/src/Etterna/Globals/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h @@ -15,13 +15,13 @@ struct CJDensityMod #pragma region params - float min_mod = 0.9F; - float max_mod = 1.3F; - float base = 0.1F; + float min_mod = 0.98F; + float max_mod = 1.08F; + float base = 0.F; - float jump_scaler = 1.F; - float hand_scaler = 1.33F; - float quad_scaler = 2.F; + float jump_scaler = 1.25F; + float hand_scaler = 0.9F; + float quad_scaler = 1.15F; const vector> _params{ { "min_mod", &min_mod },