Skip to content

Commit 5f51cb6

Browse files
keep all thing for remember
1 parent 61e19d2 commit 5f51cb6

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Etterna/Globals/MinaCalc.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,9 @@ Calc::SequenceJack(const Finger& f, int track, int mode)
508508
// dependent on the previous components of the sequence, and what comes
509509
// afterwards is not relevant (usually true in actual gameplay, outside of
510510
// stuff like mines immediately after shortjacks)
511-
int window_size = 4;
511+
int window_size = 3;
512512
if (mode == 1)
513-
window_size = 4;
513+
window_size = 2;
514514
if (mode == 2)
515515
window_size = 5;
516516
vector<float> window_taps;
@@ -560,9 +560,9 @@ Calc::SequenceJack(const Finger& f, int track, int mode)
560560
window_taps[window_size - 1] = ms;
561561

562562
float comp_time = 0.f;
563-
float hit_window_buffer = 320.f;
563+
float hit_window_buffer = 300.f;
564564
if (mode == 1)
565-
hit_window_buffer = 300.f;
565+
hit_window_buffer = 250.f;
566566
if (mode == 2)
567567
hit_window_buffer = 60.f;
568568

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

700700
fdiff = CalcClamp(fdiff, 0.f, max_diff);

0 commit comments

Comments
 (0)