Skip to content

Commit

Permalink
stuff is kinda working now wow, 269
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Apr 21, 2020
1 parent be5ba45 commit 3eb1bfe
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 12 deletions.
13 changes: 9 additions & 4 deletions Themes/Til Death/BGAnimations/_calcdisplay.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ local function updateCoolStuff()
graphVecs[1][13] = bap[23] -- stammod (should be separate prolly?)
graphVecs[1][14] = bap[24]

for i = 13, 24 do
for i = 13, 22 do
graphVecs[2][i - 12] = bap[i]
end

Expand Down Expand Up @@ -342,11 +342,13 @@ o[#o + 1] = Def.Quad {
local bmsdr = graphVecs[2][6][index]
local msdl = graphVecs[2][7][index]
local msdr = graphVecs[2][8][index]
local pll = graphVecs[2][9][index]
local plr = graphVecs[2][10][index]
if msdl == nil then
txt:settext("")
else
txt:settextf("npsl: %5.4f\nnpsr: %5.4f\nmsl: %5.4f\nmsr: %5.4f\nbmsdl: %5.4f\nbmsdr: %5.4f\nmsdl: %5.4f\nmsdr: %5.4f\n",
npsl, npsr, msl, msr, bmsdl, bmsdr, msdl, msdr)
txt:settextf("npsl: %5.4f\nnpsr: %5.4f\nmsl: %5.4f\nmsr: %5.4f\nbmsdl: %5.4f\nbmsdr: %5.4f\nmsdl: %5.4f\nmsdr: %5.4f\npll: %5.4f\nplr: %5.4f",
npsl, npsr, msl, msr, bmsdl, bmsdr, msdl, msdr, pll, plr)
--txt:settextf("Percent: %5.4f\nOverall: %.2f\nStream: %.2f\nJumpstream: %.2f\nHandstream: %.2f\nStamina: %.2f\nJackspeed: %.2f\nChordjack: %.2f\nTechnical: %.2f", (ssrLowerBoundWife + (ssrUpperBoundWife-ssrLowerBoundWife)*perc)*100, ovrl, strm, js, hs, stam, jack, chjk, tech)
end
else
Expand Down Expand Up @@ -599,9 +601,12 @@ local skillsetColors = {
color("#6c969d"), -- jack
color("#a5f8d3"), -- chordjack
color("#b0cec2"), -- tech
color("#b0cec2"), -- tech
color("1,0,0"),
color("1,0,0"),
}

for i = 1, 10 do
for i = 7, 10 do
--o[#o+1] = bottomGraphLine(i, skillsetColors[i])
o[#o+1] = bottomGraphLineMSD(i, skillsetColors[i])
end
Expand Down
22 changes: 15 additions & 7 deletions src/Etterna/Globals/MinaCalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,21 @@ Calc::InitializeHands(const vector<NoteInfo>& NoteInfo, float music_rate)
right_hand.doot[CJ] = left_hand.doot[CJ];

// pattern mods and base msd never change so set them immediately
if (debugmode)
for (size_t i = 0; i < 9; ++i) {
if (debugmode) {
for (size_t i = 0; i < ModCount; ++i) {
left_hand.debugValues[i] = left_hand.doot[i];
right_hand.debugValues[i] = right_hand.doot[i];
}
// uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh yea
// somehow i never did this and debug was still getting the
// somewhat right values... somehow??
left_hand.debugValues[BaseNPS] = left_hand.v_itvNPSdiff;
left_hand.debugValues[BaseMS] = left_hand.pureMSdiff;
left_hand.debugValues[BaseMSD] = left_hand.v_itvMSdiff;
right_hand.debugValues[BaseNPS] = right_hand.v_itvNPSdiff;
right_hand.debugValues[BaseMS] = right_hand.pureMSdiff;
right_hand.debugValues[BaseMSD] = right_hand.v_itvMSdiff;
}

j0 = SequenceJack(NoteInfo, 0, music_rate);
j1 = SequenceJack(NoteInfo, 1, music_rate);
Expand Down Expand Up @@ -523,11 +533,9 @@ Hand::InitDiff(Finger& f1, Finger& f2)
void
Hand::InitPoints(const Finger& f1, const Finger& f2)
{
v_itvpoints.resize(f1.size());
for (size_t ki_is_rising = 0; ki_is_rising < f1.size(); ++ki_is_rising)
v_itvpoints[ki_is_rising] =
static_cast<int>(f1[ki_is_rising].size()) +
static_cast<int>(f2[ki_is_rising].size());
v_itvpoints.emplace_back(static_cast<int>(f1[ki_is_rising].size()) +
static_cast<int>(f2[ki_is_rising].size()));
}

void
Expand Down Expand Up @@ -1024,5 +1032,5 @@ MinaSDCalcDebug(const vector<NoteInfo>& NoteInfo,
int
GetCalcVersion()
{
return 267;
return 269;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Etterna/Globals/MinaCalc.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Hand
bool stam,
bool debug = false);

std::vector<float> doot[5];
std::vector<float> doot[ModCount];
std::vector<int> v_itvpoints; // Point allotment for each interval
std::vector<float> v_itvNPSdiff,
v_itvMSdiff, pureMSdiff; // Calculated difficulty for each interval
Expand Down

0 comments on commit 3eb1bfe

Please sign in to comment.