Skip to content

Commit 62dba8f

Browse files
dont do this yet balance later
1 parent a3a878e commit 62dba8f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Etterna/Globals/MinaCalc.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ Calc::InitializeHands(const vector<NoteInfo>& NoteInfo, float music_rate)
434434
right_hand.doot[Jump] = left_hand.doot[Jump];
435435
right_hand.doot[CJ] = left_hand.doot[CJ];
436436
right_hand.doot[StreamMod] = left_hand.doot[StreamMod];
437+
right_hand.doot[Chaos] = left_hand.doot[Chaos];
437438

438439
// pattern mods and base msd never change so set them immediately
439440
if (debugmode) {
@@ -521,7 +522,7 @@ Calc::Chisel(float player_skill,
521522
return 0.f; // not how we set these values
522523

523524
// jack sequencer point loss for jack speed and (maybe?) cj
524-
if (ss == JackSpeed || ss == Chordjack || Technical)
525+
if (ss == JackSpeed || ss == Chordjack )
525526
gotpoints = MaxPoints - JackLoss(j0, player_skill) -
526527
JackLoss(j1, player_skill) -
527528
JackLoss(j2, player_skill) -
@@ -632,13 +633,12 @@ Hand::CalcInternal(float x, int ss, bool stam, bool debug)
632633
adj_diff[i] *= basescalers[ss];
633634
break;
634635
case Jumpstream: // dont apply cj
635-
adj_diff[i] = soap[BaseNPS][i] * doot[HS][i] / doot[Jump][i] *
636-
doot[StreamMod][i];
636+
adj_diff[i] = soap[BaseNPS][i] * doot[HS][i] / doot[Jump][i];
637637
adj_diff[i] *= basescalers[ss];
638638
break;
639639
case Handstream: // here cj counterbalances hs a bit, not good
640640
adj_diff[i] = soap[BaseNPS][i] / max(doot[HS][i], 0.925f) *
641-
doot[Jump][i] * doot[StreamMod][i];
641+
doot[Jump][i];
642642
adj_diff[i] *= basescalers[ss];
643643
break;
644644
case Stamina: // should never be the case, handled up the stack
@@ -649,7 +649,7 @@ Hand::CalcInternal(float x, int ss, bool stam, bool debug)
649649
break;
650650
case Chordjack: // use ms hybrid base
651651
adj_diff[i] =
652-
soap[BaseMSD][i] / doot[CJ][i] * doot[StreamMod][i];
652+
soap[BaseMSD][i] / doot[CJ][i];
653653
adj_diff[i] *= basescalers[ss];
654654
break;
655655
case Technical: // use ms hybrid base

0 commit comments

Comments
 (0)