Skip to content

Commit

Permalink
no give stream to the jack pls
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 5, 2020
1 parent 5b1f875 commit 52cb42c
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1252,17 +1252,25 @@ Calc::SetStreamMod(const vector<NoteInfo>& NoteInfo,
float music_rate)
{
doot[StreamMod].resize(nervIntervals.size());
int last_col = -1;

float lasttime = -1.f;
for (size_t i = 0; i < nervIntervals.size(); i++) {
int actual_jacks = 0;
unsigned int taps = 0;
unsigned int singletaps = 0;
set<float> whatwhat;
vector<float> whatwhat2;
for (int row : nervIntervals[i]) {
unsigned int notes = column_count(NoteInfo[row].notes);
taps += notes;
if (notes == 1)

if (notes == 1 && NoteInfo[row].notes == last_col)
++actual_jacks;
if (notes == 1) {
++singletaps;
last_col = NoteInfo[row].notes;
}

float curtime = NoteInfo[row].rowTime / music_rate;

Expand Down Expand Up @@ -1398,7 +1406,9 @@ Calc::SetStreamMod(const vector<NoteInfo>& NoteInfo,
// it doesn'ting need to be not needing'nt to be so severe
float prop = static_cast<float>(singletaps + 1) /
static_cast<float>(taps - 1) * 10.f / 7.f;
doot[StreamMod][i] = CalcClamp(fastsqrt(prop), 0.8f, 1.0f);
float creepy_pasta = CalcClamp(5.f - actual_jacks, 0.5f, 1.f);
doot[StreamMod][i] =
CalcClamp(fastsqrt(prop * creepy_pasta), 0.8f, 1.0f);
doot[Chaos][i] = stub;
}
}
Expand Down

0 comments on commit 52cb42c

Please sign in to comment.