Skip to content

Commit

Permalink
keep all thing for remember
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 15, 2020
1 parent 61e19d2 commit 5f51cb6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,9 @@ Calc::SequenceJack(const Finger& f, int track, int mode)
// dependent on the previous components of the sequence, and what comes
// afterwards is not relevant (usually true in actual gameplay, outside of
// stuff like mines immediately after shortjacks)
int window_size = 4;
int window_size = 3;
if (mode == 1)
window_size = 4;
window_size = 2;
if (mode == 2)
window_size = 5;
vector<float> window_taps;
Expand Down Expand Up @@ -560,9 +560,9 @@ Calc::SequenceJack(const Finger& f, int track, int mode)
window_taps[window_size - 1] = ms;

float comp_time = 0.f;
float hit_window_buffer = 320.f;
float hit_window_buffer = 300.f;
if (mode == 1)
hit_window_buffer = 300.f;
hit_window_buffer = 250.f;
if (mode == 2)
hit_window_buffer = 60.f;

Expand Down Expand Up @@ -687,14 +687,14 @@ Calc::SequenceJack(const Finger& f, int track, int mode)
// dunno if we should even multiply effective scaler again here,
// since it's applied every step of the way in comp_diff and we
// are taking the mean of comp_diff
fdiff = max_val(comp_diff) * mean(eff_scalers) * 0.95f;
fdiff = comp_diff.back() * mean(eff_scalers) * 1.55f;
else if (mode == 1)
// more burst oriented jacks, fuzzy math + intuition =
// incomprehensible mess
fdiff = comp_diff.back() * eff_scalers.back() * 0.95f;
fdiff = comp_diff.back() * mean(eff_scalers) * 1.95f;
else if (mode == 2)
// minijacks, we want them to pop on this pass, thankfully,
// that's easy to accomplish
// minijacks, why does this seem to work so well?? it's
// basically just ms + 60 i guess???? optimize later
fdiff = comp_diff.front() * 0.75f;

fdiff = CalcClamp(fdiff, 0.f, max_diff);
Expand Down

0 comments on commit 5f51cb6

Please sign in to comment.