Skip to content

Commit

Permalink
BUT WHO MAKES THE RULES???????????????????
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 9, 2020
1 parent 4b2b2ad commit 553b315
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1124,17 +1124,21 @@ Calc::SetCJMod(const vector<NoteInfo>& NoteInfo, vector<float> doot[ModCount])
doot[CJS].resize(nervIntervals.size());
doot[CJJ].resize(nervIntervals.size());
doot[CJQuad].resize(nervIntervals.size());
int last_cols = 0;
set<unsigned int> hi;
for (size_t i = 0; i < nervIntervals.size(); i++) {
hi.clear();
// sequencing stuff
int actual_jacks = 0;
int definitely_not_jacks = 0;
int last_cols = 0;
int col_id[4] = { 1, 2, 4, 8 };
int quads = 0;
bool last_was_definitely_not_jacks_maybe = false;

unsigned int taps = 0;
unsigned int chordtaps = 0;
bool no_finger_swips = true;

// bool newrow = true;
for (int row : nervIntervals[i]) {
// if (debugmode && newrow)
Expand All @@ -1150,6 +1154,10 @@ Calc::SetCJMod(const vector<NoteInfo>& NoteInfo, vector<float> doot[ModCount])

// sequencing stuff
unsigned int cols = NoteInfo[row].notes;
if (cols != last_cols)
no_finger_swips = false;

hi.emplace(cols);
// if (debugmode)
// std::cout << "cols: " << cols << std::endl;
// if (debugmode)
Expand Down Expand Up @@ -1266,6 +1274,10 @@ Calc::SetCJMod(const vector<NoteInfo>& NoteInfo, vector<float> doot[ModCount])
doot[CJS][i] = brop_two_return_of_brop_electric_bropaloo;
doot[CJJ][i] = brop;
doot[CJQuad][i] = bruh_too_many_quads;

// ITS JUST VIBRO THEN
if (no_finger_swips || hi.size() < 3)
doot[CJ][i] *= 0.85f;
// if (debugmode)
// std::cout << "final mod: " << doot[CJ][i] << "\n"
// << std::endl;
Expand Down

0 comments on commit 553b315

Please sign in to comment.