From a4ef6b6eecf8a11c6a7031389040e3fbc03da883 Mon Sep 17 00:00:00 2001 From: MinaciousGrace Date: Wed, 21 Dec 2016 07:03:09 -0500 Subject: [PATCH] rip autoplay turds --- extern/MinaCalc/MinaCalc.lib | Bin 136082 -> 136126 bytes src/Player.cpp | 60 +++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/extern/MinaCalc/MinaCalc.lib b/extern/MinaCalc/MinaCalc.lib index 0fda147c1a5b4aa11090880d8596fe045507fc59..955ef1e67e46eb50725121a81e3f80d43099681d 100644 GIT binary patch delta 1765 zcmai#ZBSHI7{{NxaWAX|yE05|iVS=2<}x;>@}lI3FwK&Vfl*_IunJ~mlbL2t%8Uv~ z+9Zjv4=gY8D&h))!Yq!>ln#U?j%oCvDFel^X0+*ziRr^yG5zm3!}OsK?T7#Uo!@!R zbI#qnbJrJ$xD<$}nx`f%NlZ@a*NZI5gW#Qv1IvS2T8TwkK9c@a_yfCzs)%?f{bsN} zBQs4-1@G>Ef2QiK(#NAy7B7v*r*Kx5a)t7@=jDzE8%oC_XD6#fwRuEW3rKttIj!t5 z>%$7s#mz(`+*xU;QCo;E@%2hWa}*I}7V+AHan^8@Y{0OP=N&WD1FsPUI1@DSF41qi z{g|O`-Afc+%>HA#_H;2(^gg}>9NkAWxSwxS##zs!#he2~UvgxXp%s@BO&$~z+i<8g zoodJ3Z< zPV*Vs1Zbq5Hm59eYU@d&t^7A+2T17@GOd&7IA{9}78sJ~JPUhPT3|?`^Bn9sX@Mb$&OX>aX@Mb$&VJZ_ z)2i*j5T`U6ij&J4-Ab~^RFNx0W{C8NTrDz7WRA#nB6CH0MHaHs>{edo%}s9QO~E_4 zAG}wXQeoZ`=0jm>#HxCcO(NSwo)mdnWRJ)`kpm(>68VY9L6Mh5j&ND4Tlpf`)oNW4 z=bEz34s+eduY$hyxMHVl_Gj%ky#lgau{=7q`~OSk^8WE1(eXKG<#DYz>T#u_jmPEU z>G4*>@lO1d%{y$%8x)&hCd=jc9Yfd=tiXr|Z#`P#s8|(tXmEEJR7ClzFkJ0;Q4om* zF}6h`6$PeSZ{HJcdl`!hhA@gWD{PCt5<5F~MTl$6PZ_oZ%z8il@20i{)Otr}nxie2 ztaHWeiTbxIZofM}8ov6`3O_fb;cM# zxgfcC3rM!!29m9PAla}3BpZGPk_WsGdQKd55@ZO9!1phm`6Q%U0AexwQpL|xLD${k djgOfBGKqK&e|=w+dtoYF`EK;W4ZG#CxC9&-1k$)hiN`7z1$*Q{&>j(>$t;04Mcom$t7P~ zMpn8k`L37M-0j+2@!*^%pGr=^u`a|^zNWJqa$XpwkBCr-T5^c`@<|-YoL(7a z3ss033W(Zyf1RQJyq>6$&(#^))CQvHLVj^)yv>T1#|nv3IIiAMU*1Txjk7?2Z7Pgh>#&$jq?A?J`%Xqvl-u4+Hrpt(WIK08o%nG8houaS_L&a4Q zeZ+YUhI(rck(aAMleo_3c>vAcCZdhZvvzzbg94V(amb_87Y{tlvf{3jb~5@;L8H5+Ojs8e_cKr_O# zb`nK#3#xNLHT)%L4D<+xw-{<+7twftw2*G1qHdnuqN_u|XwHNA$|ppg9&vBiV5q?! zA{!5&kkw1n-OG2-Jqb+X+XyT9l;{URj{QWNd4=0h4)J?#mm1WEi{lQrp_PID>f^86 zx{|=ZyIopwKhfEKUfimyexS+et%h2B0A_$RKgc{7C~L(BVM_D^%|p^X1XrRTXdagC zVYm|gK=X)nkHD4a2bu%Y9e^v*4>Sj*I|x^zA7~CqcL=UTKhQiX-J@_N`hn(fz*UQf z;c}|Su=s~L$CId7xzgiOLWSCe-X}ClXpGQ@g&IO#LLU{HBs7JU4wv#Y7kFLD62VJ( z7`$9KtAw*!IQhbPQ=GL)=oXqQoNIq8u2G;K(nB&c*{l7JWz_D zY|vYxx(>QW&<^NILA#*2f*PPLf(D>6?-WSp{R)zK!9jQP=7Nw{j*U}+^5hJVjD7(m zqql%$Up>N$`h=*B&7`krUSPtT(IYVA$@#96_R6=ADNce+y_NytzxpI1UgZaFNcEdKx};t^Z` diff --git a/src/Player.cpp b/src/Player.cpp index 3463f04ab4..41bc9ac96d 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -3143,14 +3143,17 @@ void Player::SetMineJudgment( TapNoteScore tns , int iTrack ) if (tns == TNS_HitMine) curwifescore -= 8.f; - msg.SetParam("WifePercent", 100 * curwifescore / maxwifescore); - msg.SetParam("WifeDifferential", curwifescore - maxwifescore * m_pPlayerState->playertargetgoal); - msg.SetParam("TotalPercent", 100 * curwifescore / totalwifescore); - if (wifescorepersonalbest != m_pPlayerState->playertargetgoal) { - msg.SetParam("WifePBDifferential", curwifescore - maxwifescore * wifescorepersonalbest); - msg.SetParam("WifePBGoal", wifescorepersonalbest); + if (m_pPlayerStageStats) { + msg.SetParam("WifePercent", 100 * curwifescore / maxwifescore); + msg.SetParam("WifeDifferential", curwifescore - maxwifescore * m_pPlayerState->playertargetgoal); + msg.SetParam("TotalPercent", 100 * curwifescore / totalwifescore); + if (wifescorepersonalbest != m_pPlayerState->playertargetgoal) { + msg.SetParam("WifePBDifferential", curwifescore - maxwifescore * wifescorepersonalbest); + msg.SetParam("WifePBGoal", wifescorepersonalbest); + } + if(m_pPlayerState->m_PlayerController == PC_HUMAN) + m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; } - m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; MESSAGEMAN->Broadcast( msg ); if( m_pPlayerStageStats && @@ -3183,25 +3186,26 @@ void Player::SetJudgment( int iRow, int iTrack, const TapNote &tn, TapNoteScore if (tns != TNS_Miss) msg.SetParam("Offset", tn.result.fTapNoteOffset * 1000); // don't send out ms offsets for misses, multiply by 1000 for convenience - Mina - // Ms scoring implementation - Mina - if (tns == TNS_Miss) - curwifescore -= 8; - else - curwifescore += wife2(tn.result.fTapNoteOffset * 1000.f, m_fTimingWindowScale * 95.f, 2.f, 2, -8); + if (m_pPlayerStageStats) { + // Ms scoring implementation - Mina + if (tns == TNS_Miss) + curwifescore -= 8; + else + curwifescore += wife2(tn.result.fTapNoteOffset * 1000.f, m_fTimingWindowScale * 95.f, 2.f, 2, -8); - maxwifescore += 2; - msg.SetParam("WifePercent", 100*curwifescore/maxwifescore); - msg.SetParam("WifeDifferential", curwifescore - maxwifescore * m_pPlayerState->playertargetgoal); - msg.SetParam("TotalPercent", 100 * curwifescore / totalwifescore); - if (wifescorepersonalbest != m_pPlayerState->playertargetgoal) { - msg.SetParam("WifePBDifferential", curwifescore - maxwifescore * wifescorepersonalbest); - msg.SetParam("WifePBGoal", wifescorepersonalbest); - } - if (m_pPlayerStageStats) - { - m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; - m_pPlayerStageStats->m_vOffsetVector.push_back(tn.result.fTapNoteOffset); - m_pPlayerStageStats->m_vNoteRowVector.push_back(iRow); + maxwifescore += 2; + msg.SetParam("WifePercent", 100 * curwifescore / maxwifescore); + msg.SetParam("WifeDifferential", curwifescore - maxwifescore * m_pPlayerState->playertargetgoal); + msg.SetParam("TotalPercent", 100 * curwifescore / totalwifescore); + if (wifescorepersonalbest != m_pPlayerState->playertargetgoal) { + msg.SetParam("WifePBDifferential", curwifescore - maxwifescore * wifescorepersonalbest); + msg.SetParam("WifePBGoal", wifescorepersonalbest); + } + if (m_pPlayerState->m_PlayerController == PC_HUMAN) { + m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; + m_pPlayerStageStats->m_vOffsetVector.push_back(tn.result.fTapNoteOffset); + m_pPlayerStageStats->m_vNoteRowVector.push_back(iRow); + } } Lua* L= LUA->Get(); @@ -3252,7 +3256,7 @@ void Player::SetHoldJudgment( TapNote &tn, int iTrack ) msg.SetParam("HoldNoteScore", tn.HoldResult.hns); msg.SetParam("Judgment", tn.HoldResult.hns); msg.SetParam("Type", static_cast("Hold")); - if (m_pPlayerStageStats) { + if ( m_pPlayerStageStats && m_pPlayerState->m_PlayerController == PC_HUMAN) { msg.SetParam("Val", m_pPlayerStageStats->m_iHoldNoteScores[tn.HoldResult.hns] + 1); // Ms scoring implemenation - Mina @@ -3266,8 +3270,8 @@ void Player::SetHoldJudgment( TapNote &tn, int iTrack ) msg.SetParam("WifePBDifferential", curwifescore - maxwifescore * wifescorepersonalbest); msg.SetParam("WifePBGoal", wifescorepersonalbest); } - - m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; + if (m_pPlayerState->m_PlayerController == PC_HUMAN) + m_pPlayerStageStats->m_fWifeScore = curwifescore / totalwifescore; } Lua* L = LUA->Get();