Skip to content

Commit

Permalink
applying base scalers to stam actually does break stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Apr 26, 2020
1 parent bb1360e commit 1f569d1
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static const float stam_prop =
// and chordstreams start lower
// stam is a special case and may use normalizers again
static const float basescalers[NUM_Skillset] = {
0.f, 0.975f, 0.9f, 0.925f, 0.95f, 0.8f, 0.8f, 0.95f
0.f, 0.975f, 0.9f, 0.925f, 0.f, 0.8f, 0.8f, 0.95f
};

void
Expand Down Expand Up @@ -734,13 +734,8 @@ Hand::CalcInternal(float& gotpoints,
adj_diff[i] *= pre_multiplied_pattern_mod_group_a[i];
}

if (stam) {
// not entirely happy how this is handled but stam is really a special
// case
for (auto& d : adj_diff)
d *= basescalers[Skill_Stamina];
if (stam)
StamAdjust(x, adj_diff);
}

// final difficulty values to use
const vector<float>& v = stam ? stam_adj_diff : adj_diff;
Expand Down

0 comments on commit 1f569d1

Please sign in to comment.