From 6875b2126f938c8dd93b506a9bd2ad753c16ab91 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Fri, 22 Mar 2024 20:52:08 -0700
Subject: [PATCH] stuff

---
 assets/images/editors/ui/context-icons.png    | Bin 1021 -> 1334 bytes
 source/funkin/editors/charter/Charter.hx      |   5 +++--
 .../editors/charter/CharterAutoSaveUI.hx      |   3 ++-
 .../editors/charter/CharterDeleteAnim.hx      |  11 +++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/assets/images/editors/ui/context-icons.png b/assets/images/editors/ui/context-icons.png
index 919766562e370878e90982869bc424a1f6d80754..a9de63581403f5b134af714932b9564f2032cea9 100644
GIT binary patch
literal 1334
zcmV-61<Cq}P)<h;3K|Lk000e1NJLTq004LZ000yS1^@s6MpF6n00001b5ch_0Itp)
z=>Px(@JU2LRA_<inXzx%Mij=sN0FAAMvmpUYOBgXH3X16_z&oixm)KJsDO4e?6pY#
zgm!KWbZP)MNQO>vI&|@pp&b)sv49K>P|A&Cuqv9kkt$KI19{Z(bfk_FTY2aQ5ESo@
zA5Z-8-n}D<nPDhO*~S1E027gKYWTmVl{XJNqnQ=%3q;hHI`u|q>NnlGX$Mo)sk^!O
z<e;QGPXB2yrmt<p!vwHwW&tPwumQY|8W4e*FNf_$X=a_e8@pjmx4z69HA`v3iLo5W
znRv_sESm`<hlqMp4T)ZbrioJFN@bMS$j?zxUweOk6%{`C;TyC+`DG~`!W=wo>BJ;M
zVdjKpzl%!u_EP{r{j+PLDDi=j;qLQy0DxWkR1|Ti?h*i85YREWzjnWts+_Dox_dio
z^lR%1g~HhPeFqtM*qEN6)ea<@9qk;deXvqG4IqHK`|}r*-xJ6eMX@MTS-pWL$Hos`
z9$`CT;W*A{I2<~{*Rm`iBM%YB<#;ZJeiQ->&2mwv?j|Kzyx?XcZCKuJ&6V)6vQNF9
zq=-kMPyj*>rBZ2V+cwJOavvFZL|IsP(m-qoz^(u&rkVZ74`sixe9)=8EVh(CDgW6d
z7{+Ud8U9A~A}q@zce~}{@gpZ`{#Ct`j@h6Ml}e={0H@JtAmq_^90w~aD<~F=$il-$
zI9iG5m2$x<0E>v8r<vUw+?UUZ*1$TbV(wMTG+{b1)IDprb;XH#|KPx+S>l}g<hUM<
zU<Iz)Khp<D2Uhm7x3;!GMCYQu*=)k|JXn^6)6>(ap$QLS<~KEPr!>oqnJWMWt?uUQ
z7~G%UnPnZ<2hZgrIVZrgb{ofc?gS;(s*&CI=jZtL<xAC1R!Tw@NHcP?!ZlTHJl59M
z(ChUsS&%Yc_x95$6U$=8%vTYte`6s!Gu(O4nO}Lp&07oeSYKbqXfy(Vv6#>S07pBA
zINCXknHs=-3&0Qo;P`9GhlA{YFY7rkUQ9M!d9tRmWmR*+-7{#DcFsaPHa0fkdEROW
z*w-#=gsB1Cw*mZ(0I&}=RNd?az~oJpT7PqD&8}A()O4@_W@pQDz!i}8XVj|?z+TEZ
z0L*z*t5uwxom~Mi^nD)yn3(wr5&Z!G9~VEuhjd+g5e?jT0rUY3FbU7&R(F#DeUgPQ
zE5ZJHG1v>>dZ_XZjl4cDm$m&%k~IIyo(#mpvJCg&ZX+w)T?CLs!n6zEmQ*hw%I)@Q
zwc4$dlM|9X7U5B;RDSFAdY2&aAZETyMA2Q)nQF}51MnAu(JMmp7y!4rn*gGZ1$xLb
zU=7@+TPI~LoLdqj`w76?EjN}eC!Av<IU^R3bt6=M5Mp)n@Tk>l=ytmmXn0rv{4fIs
z0NfkgkFBLNa5oW*+@Wj)Jp}a)S(*sJJ850pJQ5qNhky$NBX_~;%Helk+3TdM%gm$S
z?*j=u?67di%vXuX6Q(FmE+CsB_-Zlrq@?_byp((PT3Nk;gS!npeiR(%kS(jgk`k`8
zL@YB8&-2Pi;6cnRUQ0RvR)nc4X09QaZv|Wt=VPN+3DGf&=$Dv_rSPnd+<*Cd@T>=N
zX`e9j=3yhgc4cO+sGpz0rO*iR<xpB^)`_CF%Dj8Qz6me8FS+ut!vbN-0LIK*M(`8~
sD896flgtb>fgEZ{aF-1+O}X;;2kE0_LOxrX$p8QV07*qoM6N<$f)0FmNB{r;

literal 1021
zcmV<Z0|NYsP)<h;3K|Lk000e1NJLTq002+`000yS1^@s68rZtm00001b5ch_0Itp)
z=>Px&w@E}nR9J=Gn7?ZrM-<0D?{sGo5;+{k%C8kfML^f+4@luUU1|q%kaWUzu>XXl
z4u(`QoQ+(hvXUZ=8W%}v<3<NAV#o@NAyJ5J<g<PEQq0cm?A+|$oV>;&Ul?w8cJ}St
z&%HNqc0^T4lr*#%pn!_VG}Yk$LEXf07F4JBT@jII_M)o3g@HKT%ClA+8)tbdc3Mzf
zgbAbp^x<`YmEyi*H$VhceWw`rvdP#u%PS6T<(VY-@TSz1o(jk!fId76t|uZ#a|1=5
z6cB3_!t?s1t;lUr&ex-VzjK{G|MCOFFaB`n7GPZz`0#odcz@fA`L+81WM6#}+MAOP
z@2Xx0;F5gloE>Mm0Gtw#6?lIhe(zoCRR(sMF9_CvJ+6hfzq1!UxU<N!t9qSFzkgF6
zmk>{jDp}G$dzpI&^?zz7Xe*Sd>Qa_8c&%uh<#h!_U$Lbqnzq}6`hw=FDhATTHVn8k
zz-kk`U-h<cZ|0wjvs`UUbiVFolh;}c>?d8fY3oPc_8{l(onB@B0~29g%(CQ3U~nDi
zh{!|R5rcPga?8KRtpQ`u?A#ajMbg-xLMnPN9LBn9_3>zwGOTvayLXVe2n^r}fT-%*
z5qNW21W#4_z+`Z^aa@7-+xsamQ0mi%{+T}~^I$mS;KmKpv%a2W?x&|u`SJ1N(4Mb`
zf?*ViJZGnaS2^=*_g!W6l>qM?X8l)5;ici7^q!OJmEb{HJOJ3=*<*iauL3av-g)2!
z24M9w?)GHK_c_5mj~<mR)?cr=Y8z@1Jg8Z>`4AVtdk=Vy0XPkv;>r<x+pikGuv$G2
zfnAwfqsJA4(+td4CGsr1?LqDeM+!VJbKtuo@(;kp)zA4%E<~Rgf%gIM446=+?`&|m
zp%5=34yJ`@;l-i(4m(?4udPM>tCKhX`8E}*Y3nalM!TCy@W4c%OS_wsTd>L;#0b2P
zFz}ui_s=MIWc-INj>rhStvr*u&4d6*E3%Q-RBh|j0j5O-1q?)gZ5M&Jfq`e!)@@})
z?1x`CO%lvEacpcG8xBz$e%g+9H<x~{jldVGdQL?Cf-(}_aiId<F(&eC(Fh~&b*c4T
zoBr9$jCMD<d&itF6M1fss@l)C9&pA&45g|cV&*#w&(3?5=o=hv0MY%t60%KWFMY$v
zd(HcSi~jKBKdVc1?WU^Q54Wp|rOHdH%ax|ot#itZ4d%U5wkNohFI~(_S%?bERCNs#
rmG-5lUh@mavZ*^)Sl$r4)}HwvlBo#P%=o{(00000NkvXXu0mjfHaqo6

diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index aa7dc29c..149ecbac 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,5 +1,7 @@
 package funkin.editors.charter;
+// ! FUCK YOU CHUF (your biggest fan -lunar) <3
 
+import flixel.input.FlxPointer;
 import openfl.geom.Point;
 import openfl.geom.Rectangle;
 import flixel.graphics.FlxGraphic;
@@ -85,6 +87,7 @@ class Charter extends UIState {
 	public var uiCamera:FlxCamera;
 	public var selectionBox:UISliceSprite;
 	public var autoSaveNotif:CharterAutoSaveUI;
+	public static var autoSaveTimer:Float = 0;
 
 	public static var selection:Selection;
 
@@ -667,7 +670,6 @@ class Charter extends UIState {
 		for(s in selection) s.selected = true;
 	}
 
-	public static var autoSaveTimer:Float = 0;
 	var __autoSaveLocation:String = null;
 	public function updateAutoSaving(elapsed:Float) {
 		if (!Options.charterAutoSaves) return;
@@ -681,7 +683,6 @@ class Charter extends UIState {
 				'Saved chart at $__autoSaveLocation.json!'
 			);
 		}
-
 		if (autoSaveTimer <= 0) {
 			autoSaveTimer = Options.charterAutoSaveTime;
 			if (!autoSaveNotif.cancelled) {
diff --git a/source/funkin/editors/charter/CharterAutoSaveUI.hx b/source/funkin/editors/charter/CharterAutoSaveUI.hx
index f23149d2..66fb9f12 100644
--- a/source/funkin/editors/charter/CharterAutoSaveUI.hx
+++ b/source/funkin/editors/charter/CharterAutoSaveUI.hx
@@ -51,9 +51,10 @@ class CharterAutoSaveUI extends UISliceSprite {
 		}, 24, 14);
 		cancelButton.frames = Paths.getFrames("editors/ui/grayscale-button");
 		cancelButton.color = 0xFFAC3D3D; cancelButton.alpha = 0.2;
-		members.push(cancelButton);
+		members.push(cancelButton); cancelButton.visible = false;
 
 		cancelIcon = new FlxSprite(x-(10+16), y+8).loadGraphic(Paths.image("editors/autosave-delete"));
+		cancelIcon.color = 0xFF880000;
 		members.push(cancelIcon);
 
 		alpha = 0;
diff --git a/source/funkin/editors/charter/CharterDeleteAnim.hx b/source/funkin/editors/charter/CharterDeleteAnim.hx
index 9d920e29..ff873a2b 100644
--- a/source/funkin/editors/charter/CharterDeleteAnim.hx
+++ b/source/funkin/editors/charter/CharterDeleteAnim.hx
@@ -20,6 +20,7 @@ class CharterDeleteAnim extends CharterNote {
 
 	var __garbageAlpha:Float = 0;
 	var __deletionTimer:Float = .1;
+	@:noCompletion var __mousePos:FlxPoint = FlxPoint.get();
 	public override function update(elapsed:Float) {
 		for (deleteData in deleteNotes) {
 			deleteData.time -= elapsed;
@@ -31,10 +32,11 @@ class CharterDeleteAnim extends CharterNote {
 
 		__garbageAlpha = FlxMath.lerp(__garbageAlpha, FlxG.mouse.pressedRight && __deletionTimer <= 0 ? 1 : 0, 1/10);
 
+		FlxG.mouse.getWorldPosition(Charter.instance.uiCamera, __mousePos);
 		if (FlxG.mouse.pressedRight && __deletionTimer <= 0)
 			garbageIcon.setPosition(
-				FlxG.mouse.screenX + garbageIcon.width/2 + (.5*FlxG.random.float(-1, 1)), 
-				FlxG.mouse.screenY - garbageIcon.height + (.5*FlxG.random.float(-1, 1))
+				__mousePos.x + garbageIcon.width/2 + (.5*FlxG.random.float(-1, 1)), 
+				__mousePos.y - garbageIcon.height + (.5*FlxG.random.float(-1, 1))
 			);
 		garbageIcon.alpha = __garbageAlpha;
 	}
@@ -62,4 +64,9 @@ class CharterDeleteAnim extends CharterNote {
 
 		if (garbageIcon.alpha > 0) garbageIcon.draw();
 	}
+
+	public override function destroy() {
+		super.destroy();
+		__mousePos.put();
+	}
 }
\ No newline at end of file