Skip to content

Commit

Permalink
creepy pasta
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 5, 2020
1 parent 4902edd commit d623912
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1278,13 +1278,13 @@ Calc::SetStreamMod(const vector<NoteInfo>& NoteInfo,
float giraffeasaurus = curtime - lasttime;
// screen out large hits, it should be ok if this is a discrete
// cutoff, but i don't like it
if (giraffeasaurus < 0.25f)
whatwhat.emplace(giraffeasaurus);
//if (giraffeasaurus < 0.25f)
// whatwhat.emplace(giraffeasaurus);

// instead of making another new mod, calculate the original and
// most basic chaos mod and apply it along with the new one
for (size_t i = 0; i < notes; ++i)
whatwhat2.push_back(giraffeasaurus);
//for (size_t i = 0; i < notes; ++i)
// whatwhat2.push_back(giraffeasaurus);
lasttime = curtime;
}

Expand Down Expand Up @@ -1385,10 +1385,10 @@ Calc::SetStreamMod(const vector<NoteInfo>& NoteInfo,
// 1 tap is by definition a single tap
if (taps < 2) {
doot[StreamMod][i] = 1.f;
doot[Chaos][i] = stub;
//doot[Chaos][i] = stub;
} else if (singletaps == 0) {
doot[StreamMod][i] = 0.8f;
doot[Chaos][i] = stub;
//doot[Chaos][i] = stub;
} else {
// we're going to use this to downscale the stream skillset of
// anything that isn't stream, just a simple tap proportion for the
Expand All @@ -1407,10 +1407,10 @@ 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;
float creepy_pasta = CalcClamp(5.f - actual_jacks, 0.5f, 1.f);
float creepy_pasta = CalcClamp(3.f - actual_jacks, 0.5f, 1.f);
doot[StreamMod][i] =
CalcClamp(fastsqrt(prop * creepy_pasta), 0.8f, 1.0f);
doot[Chaos][i] = stub;
//doot[Chaos][i] = stub;
}
}
for (auto& v : doot[Chaos])
Expand All @@ -1419,8 +1419,8 @@ Calc::SetStreamMod(const vector<NoteInfo>& NoteInfo,
}
if (SmoothPatterns) {
Smooth(doot[StreamMod], 1.f);
Smooth(doot[Chaos], 1.f);
Smooth(doot[Chaos], 1.f);
//Smooth(doot[Chaos], 1.f);
//Smooth(doot[Chaos], 1.f);
}
}

Expand Down

0 comments on commit d623912

Please sign in to comment.