Skip to content

Commit

Permalink
give cjd a singles prop because snover
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Jun 23, 2020
1 parent a639c02 commit 10b54a0
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions src/Etterna/Globals/MinaCalc/Agnostic/HA_PatternMods/CJDensity.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ struct CJDensityMod

#pragma region params

float min_mod = 0.9F;
float max_mod = 1.1F;
float min_mod = 0.85F;
float max_mod = 1.15F;
float base = 0.F;

float jump_scaler = 1.35F;
float single_scaler = 1.35F;
float jump_scaler = 1.25F;
float hand_scaler = 0.9F;
float quad_scaler = 0.75F;
float quad_scaler = 0.7F;

const vector<pair<std::string, float*>> _params{
{ "min_mod", &min_mod },
{ "max_mod", &max_mod },
{ "base", &base },

{ "single_scaler", &single_scaler },
{ "jump_scaler", &jump_scaler },
{ "hand_scaler", &hand_scaler },
{ "quad_scaler", &quad_scaler },
Expand All @@ -44,20 +46,21 @@ struct CJDensityMod
}

auto t_taps = static_cast<float>(itvi.total_taps);
auto a1 =
static_cast<float>(static_cast<float>(itvi.taps_by_size[jump]) *
jump_scaler) /
t_taps;
auto a2 =
static_cast<float>(static_cast<float>(itvi.taps_by_size[hand]) *
hand_scaler) /
t_taps;
auto a3 =
static_cast<float>(static_cast<float>(itvi.taps_by_size[quad]) *
quad_scaler) /
auto a0 =
static_cast<float>(static_cast<float>(itvi.taps_by_size[single]) *
single_scaler) /
t_taps;
auto a1 = static_cast<float>(
static_cast<float>(itvi.taps_by_size[jump]) * jump_scaler) /
t_taps;
auto a2 = static_cast<float>(
static_cast<float>(itvi.taps_by_size[hand]) * hand_scaler) /
t_taps;
auto a3 = static_cast<float>(
static_cast<float>(itvi.taps_by_size[quad]) * quad_scaler) /
t_taps;

float aaa = a1 + a2 + a3;
auto aaa = a0 + a1 + a2 + a3;

pmod = CalcClamp(base + fastsqrt(aaa), min_mod, max_mod);

Expand Down

0 comments on commit 10b54a0

Please sign in to comment.