@@ -434,6 +434,7 @@ Calc::InitializeHands(const vector<NoteInfo>& NoteInfo, float music_rate)
434
434
right_hand.doot [Jump] = left_hand.doot [Jump];
435
435
right_hand.doot [CJ] = left_hand.doot [CJ];
436
436
right_hand.doot [StreamMod] = left_hand.doot [StreamMod];
437
+ right_hand.doot [Chaos] = left_hand.doot [Chaos];
437
438
438
439
// pattern mods and base msd never change so set them immediately
439
440
if (debugmode) {
@@ -521,7 +522,7 @@ Calc::Chisel(float player_skill,
521
522
return 0 .f ; // not how we set these values
522
523
523
524
// jack sequencer point loss for jack speed and (maybe?) cj
524
- if (ss == JackSpeed || ss == Chordjack || Technical )
525
+ if (ss == JackSpeed || ss == Chordjack )
525
526
gotpoints = MaxPoints - JackLoss (j0 , player_skill) -
526
527
JackLoss (j1 , player_skill) -
527
528
JackLoss (j2, player_skill) -
@@ -632,13 +633,12 @@ Hand::CalcInternal(float x, int ss, bool stam, bool debug)
632
633
adj_diff[i] *= basescalers[ss];
633
634
break ;
634
635
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];
637
637
adj_diff[i] *= basescalers[ss];
638
638
break ;
639
639
case Handstream: // here cj counterbalances hs a bit, not good
640
640
adj_diff[i] = soap[BaseNPS][i] / max (doot[HS][i], 0 .925f ) *
641
- doot[Jump][i] * doot[StreamMod][i] ;
641
+ doot[Jump][i];
642
642
adj_diff[i] *= basescalers[ss];
643
643
break ;
644
644
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)
649
649
break ;
650
650
case Chordjack: // use ms hybrid base
651
651
adj_diff[i] =
652
- soap[BaseMSD][i] / doot[CJ][i] * doot[StreamMod][i] ;
652
+ soap[BaseMSD][i] / doot[CJ][i];
653
653
adj_diff[i] *= basescalers[ss];
654
654
break ;
655
655
case Technical: // use ms hybrid base
0 commit comments