From 5e014300068af5605519576a354e417abef45f62 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Sat, 5 Nov 2022 22:40:52 +0100
Subject: [PATCH] accuracy pt1

---
 assets/data/freeplaySonglist.json             |   4 +
 assets/data/scripts/pixel.hx                  |  30 ++-
 assets/sounds/menu/volume.mp3                 | Bin 0 -> 17762 bytes
 assets/sounds/menu/volume.ogg                 | Bin 0 -> 9103 bytes
 buildnumber.txt                               |   2 +-
 source/funkin/game/PlayState.hx               | 250 ++++++++----------
 source/funkin/menus/FreeplayState.hx          |  12 +-
 source/funkin/options/Options.hx              |   3 +
 .../funkin/scripting/events/NoteHitEvent.hx   |  52 +++-
 9 files changed, 191 insertions(+), 162 deletions(-)
 create mode 100644 assets/sounds/menu/volume.mp3
 create mode 100644 assets/sounds/menu/volume.ogg

diff --git a/assets/data/freeplaySonglist.json b/assets/data/freeplaySonglist.json
index cf387481..ca58af47 100644
--- a/assets/data/freeplaySonglist.json
+++ b/assets/data/freeplaySonglist.json
@@ -1,6 +1,10 @@
 {
     "addOGSongs": false,
     "songs": [
+        {
+            "name": "test",
+            "icon": "bf"
+        },
         {
             "name": "Tutorial",
             "icon": "gf",
diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx
index c21c2bf0..cef420ee 100644
--- a/assets/data/scripts/pixel.hx
+++ b/assets/data/scripts/pixel.hx
@@ -1,10 +1,12 @@
+import funkin.scripting.events.NoteHitEvent;
+
 public var pixelNotesForBF = true;
 public var pixelNotesForDad = true;
 public var enablePixelUI = true;
 public var enableCameraHacks = true;
 public var enablePauseMenu = true;
 
-var daPixelZoom = 6;
+static var daPixelZoom = 6;
 
 /**
  * UI
@@ -49,7 +51,7 @@ function onCountdown(event) {
 
     if (event.soundPath != null) event.soundPath = 'pixel/' + event.soundPath;
     event.antialiasing = false;
-    event.scale = 6;
+    event.scale = daPixelZoom;
     event.spritePath = switch(event.swagCounter) {
         case 0: null;
         case 1: 'stages/school/ui/ready';
@@ -58,6 +60,16 @@ function onCountdown(event) {
     };
 }
 
+function onPlayerHit(event:NoteHitEvent) {
+    if (!enablePixelUI) return;
+    event.ratingPrefix = "stages/school/ui/";
+    event.ratingScale = daPixelZoom * 0.7;
+    event.ratingAntialiasing = false;
+
+    event.numScale = daPixelZoom;
+    event.numAntialiasing = false;
+}
+
 /**
  * CAMERA HACKS!!
  */
@@ -74,14 +86,14 @@ function createPost() {
         newNoteCamera.bgColor = 0; // transparent
         FlxG.cameras.add(newNoteCamera, false);
     
-        var pixelSwagWidth = Note.swagWidth + (6 - (Note.swagWidth % 6));
+        var pixelSwagWidth = Note.swagWidth + (daPixelZoom - (Note.swagWidth % daPixelZoom));
         // TODO: multikey support??
         for(s in 0...4) {
             var i = 0;
             for(str in [cpuStrums.members[s], playerStrums.members[s]]) {
                 // TODO: middlescroll???
                 str.x = (FlxG.width * (0.25 + (0.5 * i))) + (pixelSwagWidth * (s - 2));
-                str.x -= str.x % 6;
+                str.x -= str.x % daPixelZoom;
                 str.cameras = [newNoteCamera];
                 i++;
             }
@@ -92,6 +104,7 @@ function createPost() {
     
         makeCameraPixely(camGame);
         makeCameraPixely(newNoteCamera);
+        defaultCamZoom /= daPixelZoom;
     }
 }
 
@@ -100,8 +113,7 @@ function createPost() {
  */
 public function makeCameraPixely(cam) {
     cam.pixelPerfectRender = true;
-    cam.zoom /= Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y) * 6;
-    defaultCamZoom /= 6;
+    cam.zoom /= Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y) * daPixelZoom;
 
     var shad = new CustomShader('pixelZoomShader');
     cam.addShader(shad);
@@ -120,15 +132,15 @@ var pixellyShaders = [];
 function updatePost(elapsed) {
     for(e in pixellyCameras) {
         if (!e.exists) continue;
-        e.zoom = 1 / 6 / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+        e.zoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
     }
     for(e in pixellyShaders) {
-        e.pixelZoom = 1 / 6 / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+        e.pixelZoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
     }
 
     if (enableCameraHacks) {
         notes.forEach(function(n) {
-            n.y -= n.y % 6;
+            n.y -= n.y % daPixelZoom;
         });
     }
 }
\ No newline at end of file
diff --git a/assets/sounds/menu/volume.mp3 b/assets/sounds/menu/volume.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..8a5e866457ca621933d4098527cd300c7314eb2a
GIT binary patch
literal 17762
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
a|IEVvK;b{*(*LzKf1vPxE%E<nz5fOoF1?%p

literal 0
HcmV?d00001

diff --git a/assets/sounds/menu/volume.ogg b/assets/sounds/menu/volume.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e5697c93d81218e0367eafacf7e7a3745be3ea18
GIT binary patch
literal 9103
zcmeHsXH=6*xA26}MVbL=VnBKkLK74;peP*)1OY*6=qLnGIEY52iGUCgY0_&bDn&&s
zsC21@DoPQlf+C=ZqTC61&OP7x-gVz^t#^I@?yPwxGrP=wW|x^gPfXq1%mE$vU5;P8
z#zO0sd<r>-5JsFmLv-@+rvd1Wl+k`*@!KMPfH0+T{#9t42srv^$lbt=-S|gIKyFR7
z9a0!Mo^@5-w^vndFGf+3#<CkegwxJvTnI!hh;)WXH5G`&puIhuw)hYXTffpehb<9+
z88Tpu(2b<-csu}{062(AvnRUhOBW>NNCl@P>Ct+PidR#Tt~T;H$6%WNY|tt$JOI!G
zk`zl^-ju#)r-mD!WE?SD!^1?q2+b62Hm1Sy{ELM1>B8zluhX5<;>_Ev8Q|gpR!<}x
zg`+i2Q6dq1u!$5RwulsE5Lso4voEtMwV<yUDb405n(Ut~&WqbWCsp08vrWGGm4Oka
z&(gW#F{9mi|4xnRjNc8*<~q>uU33`vT{v}^Y12nZ7p4&5R9nkJ0}@;&IF^9Yzl(Z#
zSE!>$%ydc4Y=>%(vaY#>F&>scyAx*#17`yV&W2j2gr9s6YW*Pm<Y2hnYPcg`#P9ko
zbaa(gH<yk^fb2aQ$rIAKq5`?^G;)z)5oL71g{BfT3t3c}oTp#t>RI8De$T!1p3lol
zxtEn}n<M}MNoXb8BdzfNs;<__gnwVL?kzF^3w7D-C)DgGri&A6Cdx5wYPbbJn__Wt
zjYO4W{wmG>ny?-VIMSMA)Ujg3@uv}JW(NR^5o+`kYK7Xs$y14{C;YVr{EY{oDrg${
zpUb69e}M}Tx#gPdNn%!xcidD92~NwG!+e-+OA;iA%6X4Y>rPwl&|puS%q~HtQ=eV6
zNSCZFNlD+dpm!(#1hl1eTWVu=YImA{r#@R+!B#JrJDsV#<Q0VRPiL?<@jF5~k5_3-
zB|}z_*Sb4xs<;*fdsmavC2MLew&wfo7A2=LI-hBbLyoJj)4gh0>|k%rCF5fU3k~*9
z_rXHDIS%qQ-MWkpjbn5|i4=+?3I|+gPt3-&NaqX3#vL^%xpExGFIf<9d2{7x0Kzyo
zz4*^&)0MZpIG-FX(<W8buJlrl)|9>I-2dUu3(muA80f`vs?dvLYo;>&D>U@H3Tpao
zWDAmT2GRvv5e1Ekc8S+!<lhXEh!kR*bP<e-zZ-5*tcz<`&);g-XCX6gaaenl<js|}
z@D}(JXML=11`gj3w;K!`9S9vAh_&At@lVJ4D{=q~ny}57Omd3BG-q5f(P7y#@Sl<6
zhiXm`YE2L`tQ0eTCD*Z}V!Eu-vqRTR#n_z3u7@X(%1ba;v!kjKsCYu(S;Ejg!pZxg
z*7tq~%vRWp4g~%!a%dqUsu4G#N2dSp$jO$9d#4_^N1rTaO_m5wcDtHZlA1YNlFRy!
z$Z?M@N{KFtik^;&le(JhaW#!no9o?H@!{dWt$#(%F`^i(FmiN>Vt<RAdW_Iv7)_OO
z#>-o4)aro>4ba{BcLM-WAJ1mExsRCP<oj@{eK>i%h1UNZF%a9QVoX(mioF2<KLGFZ
z3w!@y=XQ$MxT@{WtluEiXuE$lBhNM_GJeld{RI*8c24@5ly3cSRPQ?*&t3i&*J8_E
z^t9#gHQ_`ii<#iI#|(1#0edq-$QUVPh=h?xEBaJmj6!tmpdAOW)c2@hcW7aE=xz=F
zvla?cF{6j|_cTyYj|HMf<+m&-rCwPVs{&7w|GfMQS!SvT)4$2Wsu*J}jQ?{<|2xC~
zYT(~$0J=DW9X`A|IU=%jBy|LcoWPRN`im+gXX{1HAOWKtV^+MH9BE9{KcfR4uuCdI
z!kQd~Eb%HFnM_?*JpRfK0Xi5WG9j@Z4Ke-fPrrsQvS_rUkfkTglTMQw=J8y`k@Bx!
zjsyS+!30QPM;rF9cgoY_20)$cVh!^PJu(3SNCfLlCIHBUVBvo~&Hp>}9|931DF7mK
zt$2NfUed)mTVu&`+Z?QcF)~O1i$c(d>1b~!s3OkGB&Fga4mcUWm@n$(D;2Z%>d6Hj
zxh;NjhSVbo1egR}6;**<uFUD+LYA&&xNfQFTn{>Uyg;=x(A2KxZXm~g+`YvBpv6G_
zxO(zraIRD|%%3Q2esV9DkC>s1&GB|OC#;gEujWdn6;dAVg@U>^k0_Yjxu^XFRxw7w
zT^R1hc01FiuF__pP%5@TN~(%6q#R(#bx$iSp}>;_yGhs=Xty(p2BW~!g^osqw;Q-Y
zAbCK(hZS;2i>)z#Hia_xutN4FfC<#l4T3e}7;RK32f$c80-)=e_qP^TG7B0%SOh46
zN>LC6eIdrt08_x`%&o(k<7lL#C*p#`$w(Kl>d1)Sz-j9h<l~eK<O`B<3?etk1|{fx
z98Q`6kanrV$BH>TqKqCa!EDbt$*EmqT1>|PGnL`bEmFV-)0+~MGcCtSB4c2lY+}%w
z0%4K`E|4xG5w{=0*kQsE07>$ba5^&?{xJWz1xXM9yQS@DZxcmsi%oU&fci0-xiTf8
zy7kG0!I_dUZ}lYSZ$Z*DyMAjwIP<rTiFVK$G)0NOq}iy1LScm?DpXWBE#IY3K0Loi
z)BixA<1kJ6A0F02y$2HbAJC3(xorTL`T`(x$1yN0G52mgJm~0X=Vcg%SsLbCj3W7*
zI(pLK@&Bj$BS?^k#QFP%q88)$yXVLH_gl+<-(UWJ_6BXd%4;kEUuQTHYaJG=Tqbsl
zCysHaKqWU|hIhgk?I_HQSQ6R5fJY}rLrVNcvQ2ckP85c@Aivkf8^hbB!IYDqWD_lY
z?;SJ{gu$iQ*lrUkNV2&me~&NSTLfCo3&Nb04Qe0^F2zgEpccaJHu8DJ>Pn@bq+z|v
zRi!8W4e$2ZIG5E(<i(I_u(Fzd(IlKw6UrR+(!vy*R{5OEFw-`P+|R!Wo6AFDFX#(<
zTw+U_Y@p+?5MpBG`;z=S830yG9bm=zv?clRypDM+JB3M`hN*>jNa%V^G!LWs6)vC8
zAG#SjjCK>tXWm3;!}Jo`jNkcBL{1nP*9JLg2q;dxpm&Qyik1l*l>CJ#NJ_$O@-lCx
z$nYvk%T&3c?<V0OUpSPpl{-U)utFJ|2m^R!Md`3?A(F_DuHZKU3WD?hMnFMunk^34
zp{3wAXtcD>W?Mq*!QocBg(!f6AaDyr69k99=i3yNgp=7C!tEDH+x_;)$TyfMS7_25
zLn#?yH)9sw&^VdyR`=VK#t_@|^~(<*6`0D-AJk_Osj)I7ptald4Q^d#mS!vokC7=z
zNleyxnSx_;lEnnXV2)`_TIe+M!7ckT07x#S9n2`~rAur;9jg~l2UxeU?Rue$#qJf!
ztIzf|QkT4?27q={JLlD?Ml>czKuV?%Nor(>I1gI72leV6koF>NyBqD8beMHGFIx#=
z5iIKJ;}Mc0i(!Hp+2$5=SSSYoVK4@_uOT2RnwvT?v-l0LaPf;sV>Gn6Hqi&bHvsf-
zq^KzODfRuD2eCRwj_Mg0nH-1P8)EY$!~z5}^VWrvHfCnt{MtcJGTP(^w67hsW6^We
z!&d?kv!SYQXriTUYOvw4aeCv-hVO>!hX01chWUoYhV)&;W&y7WZ`RA~4G@AeN~bUM
zD-@8nb1vo1DM}Y#2J~CG=pCYm7Lt?@RSxiY75AFTqh>XGSC&1)${hu{c&~}hwM8F%
z?khS@H`63#AjrZ|Utc&B<+J@J<Guc_D63rs(KcuCLfkFmdVG9E-x}!HaKm~$0>Qs*
zzt+;n*+JEVN0-X&cd~;q0Frgzzj>au#+2_UZ}P1&Dr0!9DhSbGle8EbRoq*WkYjUS
zrnIKdQ@@5HB`SKB3G>;cp(wX-P|WC<=*>ZG%?|qZZOps?c<C%2vEkjrn5V{!v2LbN
zY^t86@oY0=yIbu^v8sx|^I+JF3`;GIZ=|QE3wo4u#EC|0;K)-?SG_k@Q_c5p6No2^
zv7i7+D8exY*koBnT@8pv=rJJF9-yMOJCvX9+v@|O(%Asm!)7L1;4^&B=VW=YUKkc_
zFp32AUn?yPOCQ!S(o7<y!V24W(eS097x!Aq0lDFO6nTVqsU;@?ZqC_405njc$v7L&
z&`7#PHy{+Cb@|sf_J(<2WPhr6)nET{0zt+LmfKMH=%O7R;kmsyddD?If)vFUQB3!S
z#W162955wH%AL)OKnfWVR}xv66B85is*_db=Nld!I?Z~Q(&y=8hKdz^KYBmvGMe)&
zUj-w>KF@NE&Leea{CE#!)?@e(Y-jp%^W~buC;}rCU482~7X0U<X3|P8Bp4ztHS%GK
zEn{#zDxzvKlqRXXR3|Qs4aO;!=gLl|DOu$TZw+6UZW-Py+sfrd)mgy&<+qI{-$SRm
z^lNSJJRUTB+PSVSea^Cv(L)|F3<jrcj|y?AGL~)Yk7`ofFDG-#bEl!=ouj*EY|Ftl
zw17wWjERba;nfb&LaAJ{SiW8&bzXYO@4?vH)6{oddpkE+M(*Ykjfx#Lfx${~!SK-p
z3_gaFk!ZkI%_vVNaH)MV?dY}ZPP<rv06km2>)ZGI#XpgsP+k%t-OEfPNC#=QJqT>~
z6_nrTb-OfF77lO7%-V}^#k<^Y7}9a<{wZ<w6|<_uYeaURsDmzDKF()Vj-oyqZggs{
zmo4PbgVC<>Th=>D!_|nD?4*E4r&=A@3_qRN^(<7Z!`ouNSg|2NpNFRmud7!YeN<P*
zd_iBo^U+S8QnmEUuiYu2ff%xyGL_*YWM5M|Y^tT>wPZSHdAL~I!94=&Em}Lgm+os`
z0<P8>pG}|0&Vwr{w|a&bQ5CSjmSz9U_%?T^|Ehpzhfe$LNaSlh!kYgV?sD=Js^7e`
zSDmotT+XeWIMpkb>ECb4i<g`$Pg*7(97>z#C*(*?bW_S#^73LrU8*{<@0myO<(}jr
z5ds2(1V#+X3aPoqP1<urpN$T8cb@{jM*;>By{NorY9r4g*h-ZMMfxr1;YM^qI+NST
zzMtdYC6#{?&}v9}tX1`X)o2zS(1J(nMdae<CiAlQS?n7fwG9ts0gU*PsLq}Pxvz``
zZPP`|?(*s8Fbb6;BCJ$W=`=CwRu~e65iyMA;|3{;ST%lysC-MQvCLv8SKxX_+=YqT
z#?R+2k+}hT^Y{al9~~*0Pur0#s?Fir-71tJ(wx+Wi`t$N=IGd=G1pr!Ywn!)DhJCR
zYe<x$^W|$|R7_@|Cz&7575j#CL^;}%0nh=h4QPt>5e@G%m6}=QyRZfO&rt&+KZw}a
zl<jIQ?x)B!sWD2y53AHyj2M@CI=Wc6VOQ+BAW3*Jm2o<$E#n>Xj^qKoV6*)XT(Y8>
zLZWM8?~2CnqysGjfr8KTVs|k1GL^mz({Fck;8JD*q`kyrb`c;*l_Nq5?&}~5Hy7w<
z$V*lD-qWV-R*~%7aQ;2&<hS71H*a5^(g=tT{xP3l`6h`vYrTxS@R4G3`~5`5^}$YM
z&CfHl5r=yf%@ZxW@`HAtQJA|UaxJTxGAPv=G5v5Zvgr&Vb!A7ia7)f7xf%=3?ZU}{
zag%Z$eu1+L&y&tS7A|W&>dKtQ`&jqnc(#=4@@<Ju!N|Rwiiv%BktZ^4iuvKgn@D=3
zG6x2S+!};&gM}c{$iRyrb9xUDq&L&-p5mlZNdy;Osrt&XF$1*hE_c8>%gk1gtrbxq
ze+}QnZPnm(++tu))LCt^A6kSZOspi~@*&b;QS`17fg90P2y4LZ@|pctLKH!P^GYMI
zlv(QF4K-H(tiBP9NEsCXSS&b67a-5pgcx!-{!3CmHPF8CtZkBVbewOtO52s_OUjSK
zUMWYSiSNPzz)8A#t>irp%=u95(qFkJ{<uP%jPi9<(GJ>n+t5B>`f|APUY{FV&cLYD
zH?xxaHN{ww`Lf}Fc#oQnLu-L<gwOAG>zNad@$?QC#bDMhp3;1=`xfuZT6^i!#u<G(
zgJcy2pVeiFd*4-*AFSK=UdKElc)iNLLg?U|Fw31cxT@XS_Si}=MMbUVw@prj)CCNf
z$DbQMcWAzY@xbcq>mso;!rLY<=y0cA^YBGT^8Qgt9x^}28*1H>uT17sW8R;0V1j<+
z<x2cv6|pp@h`qK`Pt^=;lchQ2ZfIY2Zz`i`Hvut5i{VAjS2aZC2wq}<{x*{K4ml=P
zN1?$KO2JLv$mdeyHMX80pmho~rJFO)=taD)yv$&jiS=wdHa>W__3_(@?U)}$bd?s?
zeR4R3kAyGJSzFXfV>+UBc`?b2lTb}6A>M5$5M|4Y{N?5|{<B1pfson#;(3Pr?9tn^
z<L^&t@1Q@nFhTwx3+fTO2WE(B8aGI4$pRG1sU;f#s;4<POg8pS3~zj#e)@}tG`MU}
z>~uOg;gqNFF|D>z>1$uWTbIh?tiq$B;buOsSHA?F(WkdnqfVU`{ybZ|v3jSbId;j(
zO>Hct^L72#=JUC`LT17*Wj^ws&t<*wb@_wZ6HP`R(z$7(1UcPZ)Jb+_wAN<heYji0
z$>zP?t8q7`xUF-Eps-{GKm3Q@(@DCf(0W-0>5n@jFVuw|5p?(?`$179_gJuA8Ulo6
z_~EIVD&2>bWn^R}Lr9K&tV6ni$cE)Qq#{tc-Pm@}+)@*DO3pt;F6NncryHnOQkN+e
z(b{)5Qc}SAXc!;UZed2wi8Ve9`&cN@%(yP<?u$(HPya}l(pZiFmhh6KX+U+qTy|?I
zIYItF{4TCN^$uK@gl+>A04TCcIVbHfe?V)%G5BQm_r4hUQBl|ssh0L3Fkx)Lnt1!i
zyn$U<w~&)1{i@m0!JMbe;LdgLeva{@_&{kn>r^oY1kmGX*m&P3DEzeO*NeFjAt3qW
zr^1uKAym=a;*XV64pWb^?4M#+*(S=GO>TNAbxezsTSwY19`erWJ8)gRD9gDoI>x1r
z%e{$sFrdGBq>!p~n|v?no#REf0<Rp$$Hd37E_>(EZx3dSmaKmd+VDz^c@hE^ErqlT
z7&<k~9Xe(<s;*gl2^gGsi|PjNvhO!P`OtOy$D=nSE2Sx=3lXz9`0ZY%PUUa>0~unO
z6iqoyHS!r)LT)gz@yix&u=N=5QkG9Fd{yqPnoTWvcJs<>-NuI(&a8{|2TW>Vk@d}#
zY2(q*vgaK&!M2~WNZShK-I{I-cCjjbU4P7v3<8JNi!@2u0&~$EolZfS;ib|*s@{1r
z6cu#F6U!SyXCnk!j@KiR^(;eQPO_tSBEb`a5%PNJ?wg|WT(6^(<XqacKK1ljNl`@3
zA6r|WH4JA34%f%iWBLWS9A8<b>H}b~w=S@GG+@xfdHtv2GN_;bsq}O>rl}&h=wzDB
z^r@85S1ySI)PXZ!b&Fny&OVZmy;^<5e0cbj#{$-Pp_(sQ9WiM1SX}L*!kYL4E6-~R
z6ZW5YD;`@vmW?EQH@Z1eb$w|)t7P7^b#3C)G~rpR@caJTGd(LRE`<_^DaYLc<lX!D
zElr*-6hF_~R*yVD4O$xbyq%6djSW2%T+vfKnTdB>HB6uuYEbJW_Pz14ck^uj!_}3v
zqWNj<1<Fmi;6ubVtL25}VArnWyZ`W9nlE}-nO^W!?Co^hJmQrRd%nzSr}4${DPrjS
zO7p=(E_DY|W2#a{&R4x2t~&fR4e2yom-u0AQatlXprKKJyW*U%mk4sT|5q^EcH_g+
z7Q2K$z1XMBEGY=T8jM|=`J{c#JGV7kJS>+vW$AMycI74?lI{uNJXfArqn0cuy>(Nh
zs)6T&I;MIvp*D|b0DcTAnR)fN3b@LMH=<z(5NAyUzWOg?K29$AY$vtYuZJh7Rw4s`
z)=nk&2X|d`^JeVeQdp~??^}y69Sg(E&%0iq*YGvnA9A|wRl=S-b}wg24t1?q8TnNt
ze)u?Xr}pB649`Uk;~IQ&{Qa3IpX)AOUBb79P2+ZqzPG(tp+R{3M9KZ#PL1Ic&aPwo
zMTCyoz5)s;r=8XeRrAkoE-R<v&nO?)>d*{gpXZ+$x)8je(DQYrzPoN(`FU%;QCD{e
zX0gJ_)$M%y&{*sKthBhghaN$N2KcI3I+Jb{HhG2W!l{a(iPIkm_uiyBor-h}5!#m?
znssrCDeKKA&6K`7Uqs?kBLo&GSsoYJBg!{?jbf2Qy3};nrPJjc#pi6x(@aJRrOzt)
zmo?XFCmSS?EYvUQW415zPBJ3t$KsF7J!6-J4!usCTpjz!q#oe#@>~DH#@NX2v6V2!
zA^_TZ7JaI><MHN&DJ0r`aAK_tkP<@n{g7a{tQAT~-(7y_dtU6oqA*g?HaE!j;Mk~K
z5iaw3@TW@qxr;xZemtC<e*Z~t%H+xAbN<C|*r%g0KR@1=tyAwUQ&nCLjl56(C6?`B
z_J!c~S-G9N%IJ*AxySCBLLnYc99hze6Y9+S4t=U(^WGl(Le;u&ruziZ>uW??tK3nG
zuJ2?y$;gS|2404fwRQDnLmT0xOKjAQC!K2^Z9|QfpJyk`%y0O+S<IKsW|ds{c*Uwm
zxwYbIrIgg9ohh&4N_<Fnx7Udc3%C`iUT{w4*!v{w`z_T_jfLj5%JkLJUzs182R^>-
zoYxTyk>5QrvXHjg=zGR1=it;Ar`JE9(NAm8k6TGFFe{(mb6aQR`C$>VPkb{L@f9#s
zEP_)&eMEJAq)?#=F*Zn8fBp500~nJNBQ>o)4IaJk{0(z-IL^H|0*8Ws0>$UFe0Y>r
z^aBBWxn%r8wS-%pUVbVet@fQ5FlHKAJrJUBl2<Ogps{usfBuPi`Kw{0=eQ5I-Zqa6
zNt&*|eQ+|aOId!m;OdEa!4N;8H?bSj>t&-Hx4vM0d>%Oc_2)724>!V#@%41CK8bvs
zZ;~sspUJ45*ve40)-w71`PnyEZJzZ^kx$PS7<h}7L)gE~&wp59Y@Z?WcJ$>hFI)@_
z4teO+b=r6rW5gU~LtpBF@_4693pI<sXC7g+lE?ABd;X|x%{CdYWkoUT3$HJ<D_ned
zVW~a-op8&K-0Z}*{6j&-?U|hqWD{SR1V0%S9=@`$?Zw@TkLUVPFMibp2j3cglYaNd
z6SbgS_``S|)uvnZO4k&QCq&&2qu*T*auLSptVJiA{ip9gJWoGDSg%^JKVDD&Fy`X@
zpVu&01oQ1P>8b*;-IjK)&@;jD$J9lQf`g5&9i>lIR_~NpXr)%H4P5xH`7yo2FiCP_
z|NVeyTb&_^)}T{_S*K2>j6k=ruBIDiyB2bnG8ZY7$z_W;{%GNm_TX~^@3KN?7w(@)
zvaj&4@4Y{pww-Py?b=Y<x2fub$A~6Nl2yhf@p-crgf7fs4qaFA9fHxHMz--*FSI^W
z2^2p>HE*>2z8W#Bq04T@>&%K)c;vg+bx$WX>d4RJkZkU6Sj)_^lCrK9&DPW_Z?CIi
zeo95#Ix44EJlTEFeto3;+XW+@^H%C9*V_a-^S?;EeXmKScGq!H^V$l7JW?)42zmN^
zGzysdetoFO`G);9E&;@OaOYAOSsnchuz(TxwZ+?BhxWDQ*SX})uPq}v{l|4EKt$&<
zO;7NT4pR=TE)^=Zefi+wr(MHaKi$i3I&7ajJ^lU3n~tB4y4t%o+^8E_8{<zmJ{`Q^
zTM_hhed+V(XP0J69+&ErQ-Vj_W`YafPcPV2PUWi_&xW3rw(WN_;9Yshrlob`W9g9E
vKE%O;LW|=M-u+Y}tbKFvUw&~*mIHukR@x^hHlP@&>C51&xjPQYzFGbYqt5#~

literal 0
HcmV?d00001

diff --git a/buildnumber.txt b/buildnumber.txt
index a899ac6c..c659825d 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1160
\ No newline at end of file
+1163
\ No newline at end of file
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 6b55e7f4..fa5b4a4c 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -93,7 +93,7 @@ class PlayState extends MusicBeatState
 	public var notes:NoteGroup;
 
 	public var strumLine:FlxSprite;
-	public var curSection:Int = 0;
+	public var ratingNum:Int = 0;
 
 	public var camFollow:FlxObject;
 
@@ -1073,144 +1073,6 @@ class PlayState extends MusicBeatState
 
 	public var comboGroup:FlxSpriteGroup;
 
-	private function popUpScore(strumtime:Float, score:Int = 350):Void
-	{
-		var noteDiff:Float = Math.abs(strumtime - Conductor.songPosition);
-		vocals.volume = 1;
-
-		var placement:String = Std.string(combo);
-		//
-
-		var rating:FlxSprite = new FlxSprite(-40, -60);
-
-		var daRating:String = "sick";
-
-		if (noteDiff > Conductor.safeZoneOffset * 0.9)
-		{
-			daRating = 'shit';
-			score = 50;
-		}
-		else if (noteDiff > Conductor.safeZoneOffset * 0.75)
-		{
-			daRating = 'bad';
-			score = 100;
-		}
-		else if (noteDiff > Conductor.safeZoneOffset * 0.2)
-		{
-			daRating = 'good';
-			score = 200;
-		}
-
-		songScore += score;
-
-		/* if (combo > 60)
-				daRating = 'sick';
-			else if (combo > 12)
-				daRating = 'good'
-			else if (combo > 4)
-				daRating = 'bad';
-		 */
-
-		var prefix:String = "";
-		var suffix:String = '';
-
-		if (curStage.startsWith('school'))
-		{
-			prefix = 'weeb/pixelUI/';
-			suffix = '-pixel';
-		}
-
-		rating.loadGraphic(Paths.image('game/score/$prefix$daRating$suffix'));
-		rating.acceleration.y = 550;
-		rating.velocity.y -= FlxG.random.int(140, 175);
-		rating.velocity.x -= FlxG.random.int(0, 10);
-
-		var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/score/${prefix}combo$suffix'));
-		comboSpr.acceleration.y = 600;
-		comboSpr.velocity.y -= 150;
-		comboSpr.velocity.x += FlxG.random.int(1, 10);
-
-		comboGroup.add(comboSpr);
-		comboGroup.add(rating);
-
-		if (!curStage.startsWith('school'))
-		{
-			rating.scale.set(0.7, 0.7);
-			rating.antialiasing = true;
-			comboSpr.scale.set(0.7, 0.7);
-			comboSpr.antialiasing = true;
-		}
-		else
-		{
-			rating.setGraphicSize(Std.int(rating.width * daPixelZoom * 0.7));
-			comboSpr.setGraphicSize(Std.int(comboSpr.width * daPixelZoom * 0.7));
-		}
-
-		comboSpr.updateHitbox();
-		rating.updateHitbox();
-
-		var separatedScore:String = Std.string(combo).addZeros(3);
-
-
-		for (i in 0...separatedScore.length)
-		{
-			if (combo < 10 && combo != 0)
-				break;
-
-			var e = separatedScore.charAt(i);
-
-			var numScore:FlxSprite = new FlxSprite((43 * i) - 90, 80).loadGraphic(Paths.image('game/${prefix}score/num$e$suffix'));
-
-			if (!curStage.startsWith('school'))
-			{
-				numScore.antialiasing = true;
-				numScore.setGraphicSize(Std.int(numScore.width * 0.5));
-			}
-			else
-			{
-				numScore.setGraphicSize(Std.int(numScore.width * daPixelZoom));
-			}
-			numScore.updateHitbox();
-
-			numScore.acceleration.y = FlxG.random.int(200, 300);
-			numScore.velocity.y -= FlxG.random.int(140, 160);
-			numScore.velocity.x = FlxG.random.float(-5, 5);
-
-			comboGroup.add(numScore);
-
-			FlxTween.tween(numScore, {alpha: 0}, 0.2, {
-				onComplete: function(tween:FlxTween)
-				{
-					comboGroup.remove(numScore, true);
-					numScore.destroy();
-				},
-				startDelay: Conductor.crochet * 0.002
-			});
-		}
-		/* 
-			trace(combo);
-			trace(separatedScore);
-		 */
-
-		FlxTween.tween(rating, {alpha: 0}, 0.2, {
-			startDelay: Conductor.crochet * 0.001
-		});
-
-		FlxTween.tween(comboSpr, {alpha: 0}, 0.2, {
-			onComplete: function(tween:FlxTween)
-			{
-				comboGroup.remove(comboSpr, true);
-				comboGroup.remove(rating, true);
-				comboSpr.destroy();
-
-				rating.destroy();
-			},
-			startDelay: Conductor.crochet * 0.001
-		});
-
-		curSection += 1;
-	}
-
 	private function keyShit():Void
 	{
 		var pressed = [controls.NOTE_LEFT, controls.NOTE_DOWN, controls.NOTE_UP, controls.NOTE_RIGHT];
@@ -1307,18 +1169,118 @@ class PlayState extends MusicBeatState
 		if (!note.wasGoodHit)
 		{
 			note.wasGoodHit = true;
+			
+			/**
+			 * CALCULATES RATING
+			 */
+			var noteDiff = Math.abs(Conductor.songPosition - note.strumTime);
+			var daRating:String = "sick";
+			var score:Int = 300;
+			var accuracy:Float = 1;
+	
+			if (noteDiff > Conductor.safeZoneOffset * 0.9)
+			{
+				daRating = 'shit';
+				score = 50;
+				accuracy = 0.25;
+			}
+			else if (noteDiff > Conductor.safeZoneOffset * 0.75)
+			{
+				daRating = 'bad';
+				score = 100;
+				accuracy = 0.45;
+			}
+			else if (noteDiff > Conductor.safeZoneOffset * 0.2)
+			{
+				daRating = 'good';
+				score = 200;
+				accuracy = 0.75;
+			}
 
 			var event:NoteHitEvent;
 			if (note.mustPress)
-				event = scripts.event("onPlayerHit", new NoteHitEvent(note, boyfriend, true, note.noteType, note.strumID, note.noteData > 0 ? 0.023 : 0.004, note.animSuffix));
+				event = scripts.event("onPlayerHit", new NoteHitEvent(note, boyfriend, true, note.noteType, note.strumID, note.noteData > 0 ? 0.023 : 0.004, score, note.animSuffix, daRating, accuracy, "game/score/", ''));
 			else
-				event = scripts.event("onDadHit", new NoteHitEvent(note, dad, false, note.noteType, note.strumID, 0, note.animSuffix));
+				event = scripts.event("onDadHit", new NoteHitEvent(note, dad, false, note.noteType, note.strumID, 0, 0, note.animSuffix, daRating, null, "game/score/", ''));
 			
 			if (!event.cancelled) {
-				if (event.player && !note.isSustainNote)
+				if (event.countAsCombo) combo++;
+
+				if (event.showRating || (event.showRating == null && event.player && !note.isSustainNote))
 				{
-					combo++;
-					popUpScore(note.strumTime, event.score);
+					var rating:FlxSprite = new FlxSprite(-40, -60);
+			
+					songScore += score;
+			
+					rating.loadGraphic(Paths.image('${event.ratingPrefix}$daRating${event.ratingSuffix}'));
+					rating.acceleration.y = 550;
+					rating.velocity.y -= FlxG.random.int(140, 175);
+					rating.velocity.x -= FlxG.random.int(0, 10);
+			
+					var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image('${event.ratingPrefix}combo${event.ratingSuffix}'));
+					comboSpr.acceleration.y = 600;
+					comboSpr.velocity.y -= 150;
+					comboSpr.velocity.x += FlxG.random.int(1, 10);
+			
+					comboGroup.add(comboSpr);
+					comboGroup.add(rating);
+			
+					rating.scale.set(event.ratingScale, event.ratingScale);
+					rating.antialiasing = event.ratingAntialiasing;
+					comboSpr.scale.set(event.ratingScale, event.ratingScale);
+					comboSpr.antialiasing = event.ratingAntialiasing;
+			
+					comboSpr.updateHitbox();
+					rating.updateHitbox();
+			
+					var separatedScore:String = Std.string(combo).addZeros(3);
+			
+			
+					for (i in 0...separatedScore.length)
+					{
+						if (combo < 10 && combo != 0)
+							break;
+			
+						var e = separatedScore.charAt(i);
+			
+						var numScore:FlxSprite = new FlxSprite((43 * i) - 90, 80).loadGraphic(Paths.image('${event.ratingPrefix}num$e${event.ratingSuffix}'));
+						numScore.antialiasing = event.numAntialiasing;
+						numScore.scale.set(event.numScale, event.numScale);
+						numScore.updateHitbox();
+			
+						numScore.acceleration.y = FlxG.random.int(200, 300);
+						numScore.velocity.y -= FlxG.random.int(140, 160);
+						numScore.velocity.x = FlxG.random.float(-5, 5);
+			
+						comboGroup.add(numScore);
+			
+						FlxTween.tween(numScore, {alpha: 0}, 0.2, {
+							onComplete: function(tween:FlxTween)
+							{
+								comboGroup.remove(numScore, true);
+								numScore.destroy();
+							},
+							startDelay: Conductor.crochet * 0.002
+						});
+					}
+			
+					FlxTween.tween(rating, {alpha: 0}, 0.2, {
+						startDelay: Conductor.crochet * 0.001
+					});
+			
+					FlxTween.tween(comboSpr, {alpha: 0}, 0.2, {
+						onComplete: function(tween:FlxTween)
+						{
+							comboGroup.remove(comboSpr, true);
+							comboGroup.remove(rating, true);
+							comboSpr.destroy();
+			
+							rating.destroy();
+						},
+						startDelay: Conductor.crochet * 0.001
+					});
+			
+					ratingNum += 1;
 				}
 
 				health += event.healthGain;
diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx
index 8bfe19d2..bedbd543 100644
--- a/source/funkin/menus/FreeplayState.hx
+++ b/source/funkin/menus/FreeplayState.hx
@@ -273,7 +273,7 @@ class FreeplaySonglist {
 
     }
 
-    private function _addJSONSongs(songs:Array<FreeplaySong>) {
+    private function _addJSONSongs(songs:Array<FreeplaySong>, source:Bool = false) {
         if (songs != null && songs is Array) {
             for(e in songs) {
                 if (e is Dynamic) {
@@ -283,7 +283,7 @@ class FreeplaySonglist {
 
                     this.songs.push(new SongMetadata(e.name,
                         e.icon.getDefault("bf"),
-                        CoolUtil.getColorFromDynamic(e.color).getDefault(FreeplayState.defaultColor), e.difficulties));
+                        CoolUtil.getColorFromDynamic(e.color).getDefault(FreeplayState.defaultColor), e.difficulties, source));
                 }
             }
         }
@@ -298,10 +298,10 @@ class FreeplaySonglist {
         try {
             var json:FreeplayJSON = Json.parse(Assets.getText(jsonPath));
             var addOGSongs = CoolUtil.getDefault(json.addOGSongs, true);
-            songList._addJSONSongs(json.songs);
+            songList._addJSONSongs(json.songs, jsonPath == baseJsonPath);
             if (addOGSongs && (jsonPath != baseJsonPath)) {
                 var json:FreeplayJSON = Json.parse(Assets.getText(baseJsonPath));
-                songList._addJSONSongs(json.songs);
+                songList._addJSONSongs(json.songs, true);
             }
         }
 
@@ -328,7 +328,7 @@ class SongMetadata
 	public var songCharacter:String = "";
 	public var difficulties:Array<String> = ["EASY", "NORMAL", "HARD"];
 
-	public function new(song:String, songCharacter:String, color:FlxColor, ?difficulties:Array<String>)
+	public function new(song:String, songCharacter:String, color:FlxColor, ?difficulties:Array<String>, fromSource:Bool = false)
 	{
 		this.songName = song;
 		this.color = color;
@@ -336,7 +336,7 @@ class SongMetadata
 		if (difficulties != null && difficulties.length > 0) {
 			this.difficulties = difficulties;
 		} else {
-			this.difficulties = difficulties = [for(f in Paths.getFolderContent('data/charts/${song}/', false)) if (Path.extension(f = f.toUpperCase()) == "JSON") Path.withoutExtension(f)];
+			this.difficulties = difficulties = [for(f in Paths.getFolderContent('data/charts/${song}/', false, false, fromSource)) if (Path.extension(f = f.toUpperCase()) == "JSON") Path.withoutExtension(f)];
 			if (difficulties.length == 3) {
 				var hasHard = false, hasNormal = false, hasEasy = false;
 				for(d in difficulties) {
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index 6cf0d14d..45b269a8 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -21,6 +21,7 @@ class Options
 	public static var fpsCounter:Bool = true;
 	public static var autoPause:Bool = true;
 	public static var antialiasing:Bool = true;
+	public static var volume:Float = 1;
 
 	/**
 	 * PLAYER 1 CONTROLS
@@ -167,9 +168,11 @@ class Options
 		PlayerSettings.player1.setKeyboardScheme(Solo);
 		FlxG.forceNoAntialiasing = !antialiasing;
 		FlxG.autoPause = autoPause;
+		FlxG.sound.volume = volume;
 	}
 
 	public static function save() {
+		volume = FlxG.sound.volume;
 		for(field in Type.getClassFields(Options)) {
 			var obj = Reflect.field(Options, field);
 			if (Reflect.isFunction(obj) || obj is FlxSave) continue;
diff --git a/source/funkin/scripting/events/NoteHitEvent.hx b/source/funkin/scripting/events/NoteHitEvent.hx
index 858b38c9..7790d2bd 100644
--- a/source/funkin/scripting/events/NoteHitEvent.hx
+++ b/source/funkin/scripting/events/NoteHitEvent.hx
@@ -14,6 +14,14 @@ class NoteHitEvent extends CancellableEvent {
         Whenever a miss should be added.
     **/
     public var misses:Bool = true;
+    /**
+        Whenever a miss should be added.
+    **/
+    public var countAsCombo:Bool = true;
+    /**
+        Whenever ratings should be shown or not.
+    **/
+    public var showRating:Null<Bool> = null;
     /**
      * Note that has been pressed
      */
@@ -23,7 +31,7 @@ class NoteHitEvent extends CancellableEvent {
      */
     public var character:Character;
     /**
-     * Whenever the Character is the player
+     * Whenever the Character is a player
      */
     public var player:Bool;
     /**
@@ -34,6 +42,14 @@ class NoteHitEvent extends CancellableEvent {
      * Suffix of the animation. "-alt" for alt notes, "" for normal ones.
      */
     public var animSuffix:String;
+    /**
+     * Prefix of the rating sprite path. Defaults to "game/score/"
+     */
+    public var ratingPrefix:String;
+    /**
+     * Suffix of the rating sprite path.
+     */
+    public var ratingSuffix:String;
     /**
      * Direction of the press (0 = Left, 1 = Down, 2 = Up, 3 = Right)
      */
@@ -42,15 +58,42 @@ class NoteHitEvent extends CancellableEvent {
      * Score gained after note press.
      */
     public var score:Int;
+    /**
+     * Accuracy gained from pressing this note. From 0 to 1. null means no accuracy is gained.
+     */
+    public var accuracy:Null<Float>;
     /**
      * The amount of health that'll be gained from pressing that note. If called from `onNoteMiss`, the value will be negative.
      */
     public var healthGain:Float;
+    /**
+     * Rating name. Defaults to "sick", "good", "bad" and "shit". Customisable.
+     */
+    public var rating:String = "sick";
+    /**
+     * Scale of ratings.
+     */
+    public var ratingScale:Float = 0.7;
+    /**
+     * Whenever antialiasing should be enabled on ratings.
+     */
+    public var ratingAntialiasing:Bool = true;
+    /**
+     * Scale of combo numbers.
+     */
+    public var numScale:Float = 0.5;
+    /**
+     * Whenever antialiasing should be enabled on combo number.
+     */
+    public var numAntialiasing:Bool = true;
 
     /**
      * Creates a new NoteHitEvent.
      */
-    public function new(note:Note, character:Character, player:Bool, noteType:String, direction:Int, healthGain:Float, unmuteVocals:Bool = true, score:Int = 350, animSuffix:String = "") {
+    public function new(note:Note, character:Character, player:Bool, noteType:String,
+        direction:Int, healthGain:Float, unmuteVocals:Bool = true, score:Int = 350,
+        animSuffix:String = "", rating:String = "sick", accuracy:Null<Float> = 1, ratingPrefix:String = "",
+        ratingSuffix:String = "") {
         super();
 
         this.note = note;
@@ -62,6 +105,11 @@ class NoteHitEvent extends CancellableEvent {
         this.unmuteVocals = unmuteVocals;
         this.score = score;
         this.animSuffix = animSuffix;
+        this.countAsCombo = !note.isSustainNote && note.mustPress;
+        this.rating = rating;
+        this.accuracy = accuracy;
+        this.ratingPrefix = ratingPrefix;
+        this.ratingSuffix = ratingSuffix;
     }
 
     /**