From 66f946d724fb2b4b7cdc8a4c8d83f185064a18c1 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Fri, 22 Mar 2024 22:26:43 -0700
Subject: [PATCH] polish everything up

---
 assets/images/editors/deleter circle.png      | Bin 0 -> 243 bytes
 .../editors/charter/CharterAutoSaveUI.hx      |   8 +++----
 .../editors/charter/CharterDeleteAnim.hx      |  22 ++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 assets/images/editors/deleter circle.png

diff --git a/assets/images/editors/deleter circle.png b/assets/images/editors/deleter circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d63d06923ef0671332e98ff6c394c083de245ac
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)_S@)hFJ6-
zoqUk@kO7aYylApQDQ{ooLhX>ZAuek!h*qUE#Vz)FBk1SW_n1wE?}y0k`{$><Ik5lj
zl@m|%x5ODR+q5s_h?{nF?Z$>R-15Kq4s3m|`y#gdo7=QQY#Q84E<0IoOAoso+4%OK
zW;o-vDSV7^>zH~JcO24HJtlCAVe2ZUMfanapNgeDPzz?bb6xbUv~IxtgDMk_DV}w(
rVd7w6w2WQMx9#7dls_+4)om5$%(t~<nAaH&bU1^jtDnm{r-UW|UHD#l

literal 0
HcmV?d00001

diff --git a/source/funkin/editors/charter/CharterAutoSaveUI.hx b/source/funkin/editors/charter/CharterAutoSaveUI.hx
index 66fb9f12..d412bc16 100644
--- a/source/funkin/editors/charter/CharterAutoSaveUI.hx
+++ b/source/funkin/editors/charter/CharterAutoSaveUI.hx
@@ -45,16 +45,16 @@ class CharterAutoSaveUI extends UISliceSprite {
 
 			icon.animation.curAnim.curFrame = 2;
 			(new FlxTimer()).start(1, (_) -> {disappearAnimation(true);});
-			autosavingText.text += "(Canceled!)"; cancelButton.visible = false;
-			for (member in [this, autosavingText]) member.color = 0xFFB62C2C;
-			for (member in [progressBar, progressBarBack]) member.color = 0xFFE53D3D;
+			autosavingText.text += " (Canceled)!"; cancelButton.visible = false;
+			for (member in [this, autosavingText]) member.color = 0xFFE67F7F;
+			for (member in [progressBar, progressBarBack]) member.color = 0xFFE67F7F;
 		}, 24, 14);
 		cancelButton.frames = Paths.getFrames("editors/ui/grayscale-button");
 		cancelButton.color = 0xFFAC3D3D; cancelButton.alpha = 0.2;
 		members.push(cancelButton); cancelButton.visible = false;
 
 		cancelIcon = new FlxSprite(x-(10+16), y+8).loadGraphic(Paths.image("editors/autosave-delete"));
-		cancelIcon.color = 0xFF880000;
+		cancelIcon.color = 0xFFD60E0E;
 		members.push(cancelIcon);
 
 		alpha = 0;
diff --git a/source/funkin/editors/charter/CharterDeleteAnim.hx b/source/funkin/editors/charter/CharterDeleteAnim.hx
index ff873a2b..df3f565b 100644
--- a/source/funkin/editors/charter/CharterDeleteAnim.hx
+++ b/source/funkin/editors/charter/CharterDeleteAnim.hx
@@ -2,6 +2,7 @@ package funkin.editors.charter;
 
 class CharterDeleteAnim extends CharterNote {
 	public var garbageIcon:FlxSprite;
+	public var garbageCircle:FlxSprite;
 
 	public var deleteNotes:Array<{note:CharterNote, time:Float}> = [];
 	public var deleteTime:Float = .4;
@@ -9,13 +10,17 @@ class CharterDeleteAnim extends CharterNote {
 	public function new() {
 		super();
 
-		sustainSpr.color = 0xFF6D2425; color = 0xFF797171;
+		sustainSpr.color = 0xFF630000; color = 0xFF605A5A;
 		snappedToStrumline = selectable = autoAlpha = false; 
 		@:privateAccess __animSpeed = 1.25;
 
 		garbageIcon = new FlxSprite().loadGraphic(Paths.image("editors/deleter"));
 		garbageIcon.color = 0xFF880000;
 		garbageIcon.cameras = [Charter.instance.uiCamera];
+
+		garbageCircle = new FlxSprite().loadGraphic(Paths.image("editors/deleter circle"));
+		garbageCircle.color = 0xFF880000; garbageCircle.alpha = .6;
+		garbageCircle.cameras = [Charter.instance.uiCamera];
 	}
 
 	var __garbageAlpha:Float = 0;
@@ -33,12 +38,20 @@ 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)
+		if (FlxG.mouse.pressedRight && __deletionTimer <= 0) {
 			garbageIcon.setPosition(
-				__mousePos.x + garbageIcon.width/2 + (.5*FlxG.random.float(-1, 1)), 
-				__mousePos.y - garbageIcon.height + (.5*FlxG.random.float(-1, 1))
+				__mousePos.x + garbageIcon.width/2 + (.65*FlxG.random.float(-1, 1)) + 2, 
+				__mousePos.y - garbageIcon.height + (.65*FlxG.random.float(-1, 1)) - 8
 			);
+
+			garbageCircle.setPosition(
+				__mousePos.x - garbageCircle.width/2, 
+				(__mousePos.y - garbageCircle.height/2) + 2
+			);
+		}
+
 		garbageIcon.alpha = __garbageAlpha;
+		garbageCircle.alpha = __garbageAlpha*.6;
 	}
 
 	public override function draw() @:privateAccess {
@@ -63,6 +76,7 @@ class CharterDeleteAnim extends CharterNote {
 		}
 
 		if (garbageIcon.alpha > 0) garbageIcon.draw();
+		if (garbageCircle.alpha > 0) garbageCircle.draw();
 	}
 
 	public override function destroy() {