From 22f56d2c91b135d89d115230cde5da54502a4770 Mon Sep 17 00:00:00 2001
From: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Wed, 22 Mar 2023 03:20:36 +0100
Subject: [PATCH 1/7] Fix Cpu Name on older macs

---
 buildnumber.txt                              | 2 +-
 source/funkin/system/framerate/SystemInfo.hx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index ad12d720..f534e5c3 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2655
\ No newline at end of file
+2656
\ No newline at end of file
diff --git a/source/funkin/system/framerate/SystemInfo.hx b/source/funkin/system/framerate/SystemInfo.hx
index 1ac8efbd..73bb1e53 100644
--- a/source/funkin/system/framerate/SystemInfo.hx
+++ b/source/funkin/system/framerate/SystemInfo.hx
@@ -19,7 +19,7 @@ class SystemInfo extends FramerateCategory {
         var process = new sys.io.Process("wmic", ["cpu", "get", "name"]);
         if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split("\n")[1].trim();
 		#elseif (mac)
-		var process = new sys.io.Process("sysctl -a | grep brand");
+		var process = new sys.io.Process("sysctl -a | grep brand_string");
 		if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim();
 		#else
 		var process = new sys.io.Process("cat", ["/proc/cpuinfo"]);

From 02dc16acc2512f6b7f18b2d9a2222d01f4c31f99 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:49:51 +0100
Subject: [PATCH 2/7] undo & redo

---
 buildnumber.txt                              |   2 +-
 source/funkin/editors/charter/Charter.hx     | 116 +++++++++++++++++--
 source/funkin/editors/charter/CharterNote.hx |  14 +++
 source/funkin/options/Options.hx             |   1 +
 4 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index f534e5c3..ca573457 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2656
\ No newline at end of file
+2664
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 3cbbdbea..801408e1 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,5 +1,6 @@
 package funkin.editors.charter;
 
+import flixel.util.FlxSort;
 import flixel.math.FlxPoint;
 import funkin.editors.charter.CharterBackdrop.CharterBackdropDummy;
 import funkin.system.Conductor;
@@ -51,6 +52,9 @@ class Charter extends UIState {
 
     public var selection:Array<CharterNote> = [];
 
+	public var undoList:Array<CharterChange> = [];
+	public var redoList:Array<CharterChange> = [];
+
     public function new(song:String, diff:String) {
         super();
         __song = song;
@@ -78,10 +82,12 @@ class Charter extends UIState {
                 label: "Edit",
                 childs: [
                     {
-                        label: "Undo"
+                        label: "Undo",
+						onSelect: _edit_undo
                     },
                     {
-                        label: "Redo"
+                        label: "Redo",
+						onSelect: _edit_redo
                     },
                     null,
                     {
@@ -258,6 +264,7 @@ class Charter extends UIState {
 					note.updatePos(FlxG.keys.pressed.SHIFT ? (mousePos.y / 40) : Std.int(mousePos.y / 40), Std.int(mousePos.x / 40), 0, 0);
 					notesGroup.add(note);
 					selection = [note];
+					addToUndo(CPlaceNote(note));
 				}
 			}
 			if (FlxG.mouse.justReleasedRight)
@@ -265,6 +272,88 @@ class Charter extends UIState {
 		}
 		selectionBox.visible = selectionBoxEnabled;
 	}
+
+    public function deleteNote(note:CharterNote):CharterNote {
+		if (note == null) return note;
+
+        notesGroup.remove(note, true);
+        note.kill();
+		addToUndo(CDeleteNotes([note]));
+        return null;
+    }
+
+	public function deleteNotes(notes:Array<CharterNote>) {
+		if (notes.length <= 0) return [];
+
+		for(note in notes) {
+			notesGroup.remove(note, true);
+			note.kill();
+		}
+		addToUndo(CDeleteNotes(notes));
+		return [];
+	}
+
+	// UNDO/REDO LOGIC
+	#if REGION
+	public inline function addToUndo(c:CharterChange) {
+		redoList = [];
+		undoList.insert(0, c);
+		while(undoList.length > Options.maxUndos)
+			undoList.pop();
+	}
+	
+	function _edit_undo() {
+		selection = [];
+		var v = undoList.shift();
+		switch(v) {
+			case null:
+				// do nothing
+			case CCreateNotes(notes):
+				for(n in notes) {
+					notesGroup.remove(n, true);
+					n.kill();
+				}
+			case CDeleteNotes(notes):
+				for(n in notes) {
+					notesGroup.add(n);
+					n.revive();
+				}
+				sortNotes();
+			case CPlaceNote(note):
+				notesGroup.remove(note, true);
+				note.kill();
+		}
+		if (v != null)
+			redoList.insert(0, v);
+	}
+
+	function _edit_redo() {
+		selection = [];
+		var v = redoList.shift();
+		switch(v) {
+			case null:
+				// do nothing
+			case CCreateNotes(notes):
+				for(n in notes) {
+					notesGroup.add(n);
+					n.revive();
+				}
+			case CDeleteNotes(notes):
+				for(n in notes) {
+					notesGroup.remove(n, true);
+					n.kill();
+				}
+			case CPlaceNote(note):
+				notesGroup.add(note);
+				note.revive();
+		}
+		if (v != null)
+			undoList.insert(0, v);
+	}
+	#end
+
+	public inline function sortNotes()
+		notesGroup.sort((i, c1, c2) -> FlxSort.byValues(i, c1.step, c2.step), FlxSort.ASCENDING);
 	#end
     public override function update(elapsed:Float) {
         // TODO: do optimization like NoteGroup
@@ -288,14 +377,14 @@ class Charter extends UIState {
 
             if (FlxG.keys.justPressed.DELETE)
                 _edit_delete();
-        }
-    }
 
-    public function deleteNote(note:CharterNote):CharterNote {
-        notesGroup.remove(note, true);
-        note.kill();
-        note.destroy();
-        return null;
+			if (FlxG.keys.pressed.CONTROL) {
+				if (FlxG.keys.justPressed.Z)
+					_edit_undo();
+				if (FlxG.keys.justPressed.Y)
+					_edit_redo();
+			}
+        }
     }
 
 
@@ -306,8 +395,13 @@ class Charter extends UIState {
     }
     function _edit_delete() {
         if (selection == null) return;
-        for(s in selection)
-            deleteNote(s);
+		selection = deleteNotes(selection);
     }
     #end
+}
+
+enum CharterChange {
+	CPlaceNote(note:CharterNote);
+	CCreateNotes(notes:Array<CharterNote>);
+	CDeleteNotes(notes:Array<CharterNote>);
 }
\ No newline at end of file
diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx
index d0aaccef..8e87dbc8 100644
--- a/source/funkin/editors/charter/CharterNote.hx
+++ b/source/funkin/editors/charter/CharterNote.hx
@@ -50,6 +50,20 @@ class CharterNote extends UISprite {
         }});
     }
 
+	public override function kill() {
+		if (angleTween != null) {
+			angleTween.cancel();
+			angle = switch(animation.curAnim.curFrame = (id % 4)) {
+				case 0: -90;
+				case 1: 180;
+				case 2: 0;
+				case 3: 90;
+				default: 0; // how is that even possible
+			};
+		}
+		super.kill();
+	}
+
     public override function update(elapsed:Float) {
         super.update(elapsed);
         colorTransform.redMultiplier = colorTransform.greenMultiplier = colorTransform.blueMultiplier = selected ? 0.75 : 1;
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index 1a14a7a1..30a11f55 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -37,6 +37,7 @@ class Options
 	 */
 	public static var editorSFX:Bool = true;
 	public static var resizableEditors:Bool = true;
+	public static var maxUndos:Int = 120;
 
 	/**
 	 * PLAYER 1 CONTROLS

From ae14e6e61f8d7f364639d0f1202ec72326ab1ac7 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Wed, 22 Mar 2023 22:10:42 +0100
Subject: [PATCH 3/7] early beta playback + metronome

---
 assets/images/editors/ui/context-icons.png    | Bin 0 -> 737 bytes
 assets/sounds/editors/charter/hitsound.mp3    | Bin 0 -> 5012 bytes
 assets/sounds/editors/charter/hitsound.ogg    | Bin 0 -> 7942 bytes
 assets/sounds/editors/charter/metronome.mp3   | Bin 0 -> 1937 bytes
 assets/sounds/editors/charter/metronome.ogg   | Bin 0 -> 4850 bytes
 buildnumber.txt                               |   2 +-
 source/funkin/editors/UIDebugState.hx         |   8 +-
 source/funkin/editors/charter/Charter.hx      |  73 +++++++++++++-----
 source/funkin/editors/ui/UIContextMenu.hx     |   4 +-
 source/funkin/options/Options.hx              |   3 +
 source/funkin/system/Conductor.hx             |  19 +----
 .../funkin/system/framerate/ConductorInfo.hx  |   1 -
 source/funkin/utils/CoolUtil.hx               |   7 ++
 13 files changed, 74 insertions(+), 43 deletions(-)
 create mode 100644 assets/images/editors/ui/context-icons.png
 create mode 100644 assets/sounds/editors/charter/hitsound.mp3
 create mode 100644 assets/sounds/editors/charter/hitsound.ogg
 create mode 100644 assets/sounds/editors/charter/metronome.mp3
 create mode 100644 assets/sounds/editors/charter/metronome.ogg

diff --git a/assets/images/editors/ui/context-icons.png b/assets/images/editors/ui/context-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..73b8ff97642017741a10ddc90ca6bce3fa29c9ca
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000id
z000id0mpBsWB>pHlSxEDRCwBrluc+8K@`XTyZPM4kVd1BgQT{UKuhcA%|oDwUeud{
zLZubNfWfnfR*Hv$2M;QegV0hz^x#DWL8Rb8!JbUDXbCogL<m*W50fU{>~7zbH+5WV
z&BC8IJ3I5+_cfzAj)Nv2Z4=of0dlk^fpVkH*280+zgrBongOaXonc<K9$wR6{THah
zB*>@8!=aj_y08+cZ32`q2?>ybB>(gy9IG$lk~fGuz5U42TulJo2?qaFj#ZcdwUCV2
zm*|}@V2u3n>0XTQJ&VgUUll-)D>S!<UKgyTG=)U*Ek+3z({#M<Ifb+@gt7#x33dZ@
zhWRC|Qo^>Gr^q@sk_4M=KZL>7HhiORzevjh7*xXYy7H+j-WiP=!tWp8y4^sZrePtz
z9|Q4y$TO@Wa~M*R?N?giFJNvQ=LtGMFf)=srsFUs875Q{l@`E=*f4b;X<D2KL~x_~
zBwo0382I=YN2)(?RZJRD40oNt6ZT4|N?MU^6BW66H;NI<M8EiZv;!A*_2H8|6@>|O
zmp|jCs3^6_*zPm9tAtsVJt&%c9cWgt^}|Elwk@OxTHbjO7q@re=iD@6U*F&s!6MWi
z6FsLfM9>8WRyouadHiI^1}VH$L_Gf-_o#xMRKa{(3L{@$;R?OC)B8;FI5MFfn4`5z
z3ark@&X&L}oOEHsr5rkolLU1TB~Rzcwvzo$9;eCU0<BqOn9N%Pzb}Wi+s5Du3o9xf
zrkow1oMj0ns%*!SIG0Evw?W=in7vj-0{WG<F}Q(4RHR`l(ov5O&-M)Bn&Q>6QiOHS
zSWr)jJP`p!8ZWFXl3_O7FbQ<ub3VoDyvbyM=?e1?m;`Qgfl5gaEk*XfVB%Q?W^pNI
TtTq`200000NkvXXu0mjffEq|D

literal 0
HcmV?d00001

diff --git a/assets/sounds/editors/charter/hitsound.mp3 b/assets/sounds/editors/charter/hitsound.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..67cbc2513dcf4aee8b7007462a629d1fa47f4728
GIT binary patch
literal 5012
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

literal 0
HcmV?d00001

diff --git a/assets/sounds/editors/charter/hitsound.ogg b/assets/sounds/editors/charter/hitsound.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c037ff133d5a56f1ad5a2d39c2bd71d03f9515fb
GIT binary patch
literal 7942
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
H?E(J<amWZF

literal 0
HcmV?d00001

diff --git a/assets/sounds/editors/charter/metronome.mp3 b/assets/sounds/editors/charter/metronome.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..e3e6cb475f49a89d5d8ab14abf41a6bcf13b8e6d
GIT binary patch
literal 1937
zcmeZtF=l1}0mG1phzKC94#dv+1(ija=@}&q&dvr3`U>G8ZUH_(+9f|XF*7e!p`bJ=
zCo}o~?+HghI#EDGW?ni_fFFoi7#P^Y7$)HW2XKM6xWIp00BBc$kE5@vv7VuU0n1L9
zdqfpf*mxZo7$1P#kyjOe1tu|4=>NYj03(Pig1L5!0E6~}-EY2|Hh4^2;+U1GvpJ7}
z-5nH3f(`u)!GCOQ^MGvj_W%DsFgSmfpOL^gU!kI+{`LPaa`wPb|6^lgV*m;@APr^I
z|6^ca%doNe|Gz=`I+xptORVOl;g&vKh71lqE#Fm+dCV5|$nDeKoHN(kk0bTT0=EE*
z6V6=;hdWJj7|s~4Nb{XjrOg)iRk>tx!c?P=F1y}bbK1Ht-rdD4ev_(9faFb?WxwBh
z{MJhs5!lih7McB_XFZGV{j`k|da~0U3WR$->pA9Z{dsEZn%7>cUyQUaf4+1>H8|P#
z%g(6TbFO@Sv-!`9*JqN`&fESyT%K8%Rkrt4-qqh`?>{}OTC`xTdV6~M$G?|dHXYit
zUH<>?FPqIbOpDkU{r+jyI@@bDQ<KkZ`2X*_&h|U1H^a96Sv$RSb+~!|=imSLeg7{H
zO@aSj@BFrQ`n9!3GZT$D-t6*hZ~3p4kkS3+z-7;1&Ei)x47d;H?%ub}Ooqv=@WJDf
zS02KXO_?THs+xbc%-tIGt$S*4xc#r%uhu)i&fh&{&$a$1m)8We%)2DGNHJ_*q{60G
z{!=2Ri8h7@Y<4~M=&I`Kr3WV~h%R`Y{2=iHi(~e*lgFOC7VK+I){Rv<FUi=xC4Fho
z=Gp6$Eg4RHYq=B=65+)VAjs^kD6%tcD*xu_Z?jf-zg@U1Bv}6Q+jt(U4a*tBQr)$6
zQbUt?LT4|{^!&gfywb3hF_^{mciQ%sY)nC!|NklnHm!Cu`j(Qk;Z2m7{GWY0|9iHo
zemA(g@mP1_6a_|sCsR*1U(QTgq2vDNSjub<)0tum_N=~^JKL!tV3tFH`mUCi=Wc$p
zpBVWDd2$OWYHMts*jzX%Xyy4B@lD28V>2e_$CsNkyF9vb=4bMJPxF<({x{89eKXUY
zNB(1>$g<zc_y2$Yut$?$(>OZp^XnJyw!U2Po4>RAtF~ZXY{P}E7d1jX)DlFuiCqZD
zP+;%aweiqru}bZx*IsIiI<GAdZ7qvD6Z)-gdy%QL=$c5~nV;uena8Pm=MHP2%Dl89
zSCvf3uWkob=0>+Mm95~8(U>)DVZ)pkTEc9NYb*~2WE7v~Y*@J9#gqu^O<dP_+5P_i
zPB`+hf%nDE#J|l9N_++xJE!!1-SG0xm-mmN;6=_VA^=H>i7=0zN<e||fk7a*-ulf_
ro`Ywmr~Pf_N};C%27_Jye+wMB#(aQ*5m@jsC@?UXGyrQj8aNC9MRt&x

literal 0
HcmV?d00001

diff --git a/assets/sounds/editors/charter/metronome.ogg b/assets/sounds/editors/charter/metronome.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..18a16bc916337eae84de7b8d1c7d32fcd86b2124
GIT binary patch
literal 4850
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

literal 0
HcmV?d00001

diff --git a/buildnumber.txt b/buildnumber.txt
index ca573457..3081bd86 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2664
\ No newline at end of file
+2667
\ No newline at end of file
diff --git a/source/funkin/editors/UIDebugState.hx b/source/funkin/editors/UIDebugState.hx
index d2179195..e72f6030 100644
--- a/source/funkin/editors/UIDebugState.hx
+++ b/source/funkin/editors/UIDebugState.hx
@@ -33,7 +33,7 @@ class UIDebugState extends UIState {
                     null,
                     {
                         label: "Exit",
-                        onSelect: () -> {FlxG.switchState(new funkin.menus.MainMenuState());}
+                        onSelect: (t) -> {FlxG.switchState(new funkin.menus.MainMenuState());}
                     }
                 ]
             },
@@ -107,13 +107,13 @@ class UIDebugState extends UIState {
             openContextMenu([
                 {
                     label: "Test 1",
-                    onSelect: function() {
+                    onSelect: function(t) {
                         trace("Test 1 clicked");
                     }
                 },
                 {
                     label: "Test 2",
-                    onSelect: function() {
+                    onSelect: function(t) {
                         trace("Test 2 clicked");
                     }
                 },
@@ -122,7 +122,7 @@ class UIDebugState extends UIState {
                     childs: [
                         {
                             label: "Test 4",
-                            onSelect: function() {
+                            onSelect: function(t) {
                                 trace("Test 4 clicked");
                             }
                         }
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 801408e1..3ab00714 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,5 +1,6 @@
 package funkin.editors.charter;
 
+import flixel.system.FlxSound;
 import flixel.util.FlxSort;
 import flixel.math.FlxPoint;
 import funkin.editors.charter.CharterBackdrop.CharterBackdropDummy;
@@ -34,6 +35,11 @@ class Charter extends UIState {
     public var gridBackdrop:CharterBackdrop;
     public var gridBackdropDummy:CharterBackdropDummy;
 
+	public var hitsound:FlxSound;
+	public var metronome:FlxSound;
+
+	public var vocals:FlxSound;
+
     /**
      * ACTUAL CHART DATA
      */
@@ -64,6 +70,8 @@ class Charter extends UIState {
     public override function create() {
         super.create();
 
+        trace('Entering Charter for song $__song with difficulty $__diff.');
+
         topMenu = [
             {
                 label: "File",
@@ -132,7 +140,8 @@ class Charter extends UIState {
                 label: "Playback",
                 childs: [
                     {
-                        label: "Play/Pause"
+                        label: "Play/Pause",
+						onSelect: _playback_play
                     },
                     null,
                     {
@@ -144,13 +153,22 @@ class Charter extends UIState {
                     null,
                     {
                         label: "Go back to the start"
+                    },
+                    null,
+                    {
+                        label: "Metronome",
+						onSelect: _playback_metronome
+                    },
+                    {
+                        label: "Visual metronome"
                     }
                 ]
             }
         ];
 
-        trace('Entering Charter for song $__song with difficulty $__diff.');
 
+		hitsound = FlxG.sound.load(Paths.sound('editors/charter/hitsound'));
+		metronome = FlxG.sound.load(Paths.sound('editors/charter/metronome'));
 
         charterCamera = FlxG.camera;
         uiCamera = new FlxCamera();
@@ -190,6 +208,9 @@ class Charter extends UIState {
         CoolUtil.loadSong(__song, __diff, false, false);
 
         Conductor.setupSong(PlayState.SONG);
+
+		FlxG.sound.music = FlxG.sound.load(Paths.inst(__song, __diff));
+		vocals = FlxG.sound.load(Paths.voices(__song, __diff));
         
         for(strID=>strL in PlayState.SONG.strumLines) {
             for(note in strL.notes) {
@@ -200,6 +221,12 @@ class Charter extends UIState {
         }
     }
 
+	public override function beatHit(curBeat:Int) {
+		super.beatHit(curBeat);
+		if (Options.charterMetronomeEnabled)
+			metronome.replay();
+	}
+
 	/**
 	 * NOTE AND CHARTER GRID LOGIC HERE
 	 */
@@ -302,7 +329,7 @@ class Charter extends UIState {
 			undoList.pop();
 	}
 	
-	function _edit_undo() {
+	function _edit_undo(_) {
 		selection = [];
 		var v = undoList.shift();
 		switch(v) {
@@ -327,7 +354,18 @@ class Charter extends UIState {
 			redoList.insert(0, v);
 	}
 
-	function _edit_redo() {
+	function _playback_play(_) {
+		if (FlxG.sound.music.playing) {
+			FlxG.sound.music.pause();
+			vocals.pause();
+		} else {
+			FlxG.sound.music.time = vocals.time = Conductor.songPosition;
+			FlxG.sound.music.play();
+			vocals.play();
+		}
+	}
+
+	function _edit_redo(_) {
 		selection = [];
 		var v = redoList.shift();
 		switch(v) {
@@ -350,6 +388,10 @@ class Charter extends UIState {
 		if (v != null)
 			undoList.insert(0, v);
 	}
+
+	function _playback_metronome(t) {
+		t.icon = (Options.charterMetronomeEnabled = !Options.charterMetronomeEnabled) ? 1 : 0;
+	}
 	#end
 
 	public inline function sortNotes()
@@ -358,7 +400,6 @@ class Charter extends UIState {
     public override function update(elapsed:Float) {
         // TODO: do optimization like NoteGroup
 		updateNoteLogic(elapsed);
-        
 
         super.update(elapsed);
 
@@ -366,34 +407,28 @@ class Charter extends UIState {
 
         // TODO: canTypeText in case an ui input element is focused
         if (true) {
-            if (controls.LEFT)
-                FlxG.camera.scroll.x -= 250 * elapsed;
-            if (controls.RIGHT)
-                FlxG.camera.scroll.x += 250 * elapsed;
-            if (controls.UP)
-                FlxG.camera.scroll.y -= 250 * elapsed;
-            if (controls.DOWN)
-                FlxG.camera.scroll.y += 250 * elapsed;
-
             if (FlxG.keys.justPressed.DELETE)
-                _edit_delete();
+                _edit_delete(null);
 
 			if (FlxG.keys.pressed.CONTROL) {
 				if (FlxG.keys.justPressed.Z)
-					_edit_undo();
+					_edit_undo(null);
 				if (FlxG.keys.justPressed.Y)
-					_edit_redo();
+					_edit_redo(null);
 			}
+
+			if (FlxG.keys.justPressed.SPACE)
+				_playback_play(null);
         }
     }
 
 
     // TOP MENU OPTIONS
     #if REGION
-    function _file_exit() {
+    function _file_exit(_) {
         FlxG.switchState(new CharterSelection());
     }
-    function _edit_delete() {
+    function _edit_delete(_) {
         if (selection == null) return;
 		selection = deleteNotes(selection);
     }
diff --git a/source/funkin/editors/ui/UIContextMenu.hx b/source/funkin/editors/ui/UIContextMenu.hx
index 449d9e40..e6fad90e 100644
--- a/source/funkin/editors/ui/UIContextMenu.hx
+++ b/source/funkin/editors/ui/UIContextMenu.hx
@@ -78,7 +78,7 @@ class UIContextMenu extends MusicBeatSubstate {
     public function select(option:UIContextMenuOption) {
         var index = options.indexOf(option);
         if (option.onSelect != null)
-            option.onSelect();
+            option.onSelect(option);
         if (callback != null)
             callback(this, index, option);
         close();
@@ -108,7 +108,7 @@ typedef UIContextMenuCallback = UIContextMenu->Int->UIContextMenuOption->Void;
 typedef UIContextMenuOption = {
     var label:String;
     var ?icon:Int;
-    var ?onSelect:Void->Void;
+    var ?onSelect:UIContextMenuOption->Void;
     var ?childs:Array<UIContextMenuOption>;
 }
 
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index 30a11f55..b701614d 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -39,6 +39,9 @@ class Options
 	public static var resizableEditors:Bool = true;
 	public static var maxUndos:Int = 120;
 
+	// CHARTER
+	public static var charterMetronomeEnabled:Bool = false;
+
 	/**
 	 * PLAYER 1 CONTROLS
 	 */
diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx
index 0d3c19d9..491b1ccf 100644
--- a/source/funkin/system/Conductor.hx
+++ b/source/funkin/system/Conductor.hx
@@ -93,9 +93,6 @@ class Conductor
 
 	
 	@:dox(hide) public static var lastSongPos:Float = 0;
-	@:dox(hide) public static var lastSongPosTime:Float = 0;
-	@:dox(hide) public static var speed:Float = 0;
-	@:dox(hide) public static var destSpeed:Float = 0;
 	@:dox(hide) public static var offset:Float = 0;
 
 	/**
@@ -107,7 +104,6 @@ class Conductor
 
 	public static function reset() {
 		songPosition = lastSongPos = curBeatFloat = curStepFloat = curBeat = curStep = 0;
-		speed = 1;
 		bpmChangeMap = [];
 		changeBPM(0);
 	}
@@ -154,27 +150,18 @@ class Conductor
 		reset();
 	}
 
-	private static var __timeUntilUpdate:Float;
-	private static var __elapsedAL:Float;
-	private static function __updateSongPos(elapsed:Float, mainTime:Float) {
+	private static function __updateSongPos(elapsed:Float) {
 		if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
-			speed = destSpeed = 1;
 			lastSongPos = FlxG.sound.music != null ? FlxG.sound.music.time : 0;
-			lastSongPosTime = mainTime;
 			return;
 		}
 
-		var lastPos = lastSongPos;
 		if (lastSongPos != (lastSongPos = FlxG.sound.music.time)) {
 			// update conductor
-			__timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = mainTime));
-			__elapsedAL = (lastSongPos - lastPos);
-			destSpeed = FlxMath.bound(__timeUntilUpdate / __elapsedAL, 0.925, 1.075);
 			songPosition = lastSongPos;
 		} else {
-			songPosition += elapsed * 1000 * speed;
+			songPosition += elapsed * 1000;
 		}
-		speed = FlxMath.lerp(speed, destSpeed, FlxMath.bound(elapsed, 0, 1));
 	}
 
 	private static function onStateSwitch(newState:FlxState) {
@@ -188,7 +175,7 @@ class Conductor
 	private static function update() {
 		if (FlxG.state != null && FlxG.state is MusicBeatState && cast(FlxG.state, MusicBeatState).cancelConductorUpdate) return;
 
-		__updateSongPos(FlxG.elapsed, Main.time);
+		__updateSongPos(FlxG.elapsed);
 
 		if (bpm > 0) {
 			// updates curbeat and stuff
diff --git a/source/funkin/system/framerate/ConductorInfo.hx b/source/funkin/system/framerate/ConductorInfo.hx
index 009f3224..2fdfa11c 100644
--- a/source/funkin/system/framerate/ConductorInfo.hx
+++ b/source/funkin/system/framerate/ConductorInfo.hx
@@ -13,7 +13,6 @@ class ConductorInfo extends FramerateCategory {
         _text += '\n - ${Conductor.curStep} steps';
         _text += '\n - ${Conductor.curMeasure} measures';
         _text += '\nCurrent BPM: ${Conductor.bpm}';
-        _text += '\nCurrent speed: ${FlxMath.roundDecimal(Conductor.speed, 2)}x';
         _text += '\nTime Signature: ${Conductor.beatsPerMesure}/${Conductor.stepsPerBeat}';
         
         this.text.text = _text;
diff --git a/source/funkin/utils/CoolUtil.hx b/source/funkin/utils/CoolUtil.hx
index 1752362f..d96b3ed3 100644
--- a/source/funkin/utils/CoolUtil.hx
+++ b/source/funkin/utils/CoolUtil.hx
@@ -1,5 +1,6 @@
 package funkin.utils;
 
+import flixel.system.FlxSound;
 import funkin.system.Conductor;
 import flixel.system.FlxSoundGroup;
 import animateatlas.AtlasFrameMaker;
@@ -410,6 +411,12 @@ class CoolUtil
 		#end
 	}
 
+	public static function replay(sound:FlxSound) {
+		sound.stop();
+		sound.time = 0;
+		sound.play();
+	}
+
 	public static inline function maxInt(p1:Int, p2:Int)
 		return p1 < p2 ? p2 : p1;
 }

From d3a681d55a7f1ff71f6e782c0f1d17dd157b1c51 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Wed, 22 Mar 2023 22:43:52 +0100
Subject: [PATCH 4/7] more playback stuff

---
 assets/sounds/editors/charter/metronome.mp3 | Bin 1937 -> 1989 bytes
 assets/sounds/editors/charter/metronome.ogg | Bin 4850 -> 4871 bytes
 buildnumber.txt                             |   2 +-
 source/funkin/editors/charter/Charter.hx    |  48 ++++++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/assets/sounds/editors/charter/metronome.mp3 b/assets/sounds/editors/charter/metronome.mp3
index e3e6cb475f49a89d5d8ab14abf41a6bcf13b8e6d..30dbfa8f9205aa128784cd8451d1408202fe36d0 100644
GIT binary patch
delta 1087
zcmbQpf0TbhyiXTHFAlI17kGyYOx!3u@c_%jL#nJ@Yi6|WpZM|hBu3Wy|GzIBVPN3e
zz}&b+fI)}R`fa)C0*{H49K15MC%t1}50hhHU`S)DVCetw;maH#o1ee_=L7~8Gx`4w
z{r~y-|NsAgz{bX=ZvX##a&mGK4Cy~ADk`cRfC?Et{QuGbq!=GQeE*Muq5j9e$6TD&
zJS<DL#yl00IAYM?vvkG@#(EVo#fB_SgW`bPra2S2PaJ45Kk4ou9mK{WIn#qlBk4GE
zmI#}i*233w_ugbS=F7A?;v8N2+v?=Hc*mxn`Zt1IVz;H_ulemg#bjB?pH{{d+LBAV
zG;$b~%Wvv1eciv|3p=C5mFcfs9<5uua&_3tr9!_XMKktvMSWReX7qmPsVjB$#lhD%
zoqv7t`i$c;l^^Hjz12Um#Poe|{OWJHxAzv?1_p#Jo_2G4|6h~UI@+fT@BhEQwC~<V
zosCJ`@1Ob_lYi~_M4kN9_J6zYY&yTgd(*P5f7VVfT^%BQ{O8~Q_pAT+149Q4O7Hv*
zoBH+t(zQn_5{)@^cX>8EStRy=voXh`{`f^JHp5ay?aA9L+v<*-DBzSl-rRe6rGlT&
z6)u^Ar^c1@bGJr)>uHoV&3OLh_p9>a*Y@R_m22fsF3(c%&*Zo$usU96LS(7>DV;Ui
zOzRe=ty!lV6tycx(ugsNZ|mO1D-8^cReR>>Ijpdj<=V$6Hqqj!TjE>Eml0vR&2|Wj
zuC4d}y+T@Z`7frz5HXqB1zA@%&c52GVw4kKP@-I}w3($j^w&Fe9;*$@8N;$=)@;&R
zEs(V4uC|wdgTq|U9u2M;O8U1=_j@*Ln*9GaaV2Y5PwJZ!sfRaaMAU!!_581z$n?9%
z-u7wr6i!iK6u6VK)b(`LK{XD(1h&Udb8J#s)f8*%!`G}`=yX5Q)<Hw`4p)bgC*R?Z
z%QqZ48_43w((0n*7x2r?VaLhT;5lW7KAZ^543AQ|-M4f5w8lk+S!tCz#V^%f?bUx_
zuz1yu)TP2a@*i`#v~tV(YwJzxxdj%>1*I*VUits!-K;HFYMYbd{<^3OCJ8@NNfU{9
z8v2R5y;<QwO?{R!4=|NZ;7Am7a9kwyQLi+>pn&c1KM%ix_SChKO#gXRST*Mgo?|ok
z!Q;=_DX_9r^kJ_L3!k-%mUHJL)<+&LCzC8PI(IlK{{NkD<P8Jwjh*R#J~JqZZOEvc
z!grCedrA2*i&$R8OB%^RpC);_#m|};^iojvm<p?w##;H0r=;wH%(VEQ7UWO0e()gD
zL)iSkeiZYeXZ8Qz&zfw_x>fZ5?}8&Q8-zS3JAR$QprtRh%-r08VX`CJi^&bFHb7Z{
aBiEP@FfcBWVPH^TU@!rCg=KOfYcK#4Qv|gD

delta 1019
zcmX@gKaqbzyiXXzBpl!XF7Or?n7C1R;sKV4hg4a^@~YymO#JwI5+iH<|KAsmFfedM
zFxPGoV9<WB`^|UL29JqL9J4ZYHs>+0yYn+JFbFpEGX(#!vCRXr+1vmB|G?n<S$;+W
z<9vmRiu%|8zsTAD|NsAwjg5@~PyqvwhBE5^F)*-Y*x3C4-=KV*%k9J^R`b$uOP?-7
z1_z&(?<&VUW{cK)<o0QA&YA1&$C3JEfm?vZ3Foea!<{BM3}=j2r1{RN(q@bMs$4QT
zVXDzbmtAkJIc;4R@9tt2ze!alK=P){vfuALe(R-+2yE#Li_HGevz|rwe%eL}J=y6F
z1;V|a^&E4y{yepH&1)~!FGgCIKVQ0`8l3F=WoOjvIaj{E+5G3l>-savY3FVK9xl(U
z%PQOZD(~uVv-h8#RV`YuR=qtv{o~)uE}IVR*)IS8_m|D)8>U5UjDG*LYMt#ho2kiX
zHvIqhU1$3p)tg~k|E!%}x;osv|MTzv`@a8|2Zja+{CmCg+uG^Z)*j7FH0F4-%d@@Z
zzg9v<_m=~gJ%criU(GP!KAc;>d*3!Q878;F2aii$c?eH7WtwEEYW~?WcWczQ?y14y
z_P=VsTJQWifA^F<*ZQAaUK7wV?~>pm#jt&m3Y%W}Pl=c&+87?N+4a<;tE#J)9-OQo
zy5M#4gTxCgj@i>r9((dyu&+5;H&*GqBxC!Q^rb<YXRlATWH|Ay<x)gQgcn1AAalL9
zqR7s)sr;Lxzs*|V{dVE5kYM@GZ{vBaHY{fhOLf=QNexZn37x$()AIv|@Jhp0#$XoL
z-)Y-lvM~i^{{O2S*tFWs=vzwChBr}S@_+X2{O{SS`rY8}#$(-yQxq5lo=iR6d^s~|
zg^v55V=1#eOlOKM*t7at?rf)qfLRU&>bqK6>Yuy$&3<C!8|29?q^Pa2d17<nq@b1O
zW5hQZUyaR}oF89q&g}B&%9)?Z^F7U1{`%iEYxT`ccOLnVg(Ay-E8qYB{lgwjeof=(
zu+OhwyxaP6#c%%3>aW^@d9e)_wqDc-^-xO?-6nP+AVYz@W7oz*pT#P*n_hdVE$Y0s
zK(w_i@=R#zx4P{`rp}^kB6Vkeo^xd$r|O+Mtbr=?(u!PFG9|yd9aNbc-Nsb5f;&cI
z*0hBUb6#i(vo)@<JQ$Ese44Xi;er=aBCI!YUE^i<`~N%P$j1iW7dsRGHZv&k8D#97
z())G8%R67*KZ=^1&$@N;0ag=HkfIL^0=f0pZ<g{LJTpD*Z!=fQWJk6SlVjOAnf@_M
I&R~xP0Aa8NVE_OC

diff --git a/assets/sounds/editors/charter/metronome.ogg b/assets/sounds/editors/charter/metronome.ogg
index 18a16bc916337eae84de7b8d1c7d32fcd86b2124..019d024346c9148eda11412d55e6ed7db3a88b92 100644
GIT binary patch
delta 904
zcmV;319$xLC5I*&PiJRS00IC200000003WW00000008gYV(O6^E(~9500031003+N
z<)N`uNDqHsYXATO0001C*SEL_H#avi^VYb;UOlS~K>&`{SC)rL^D%MY-|gGiJ2fvB
z)ls)NT?uV^k2inL0-wHJgypDSxAIBfgA!urFbvFMz1@gV!$_NzX1^l_DIU&S4YKYA
z?b=Tb{p4h}QpK>B3h1#)_8TtoUmx)-$tzLOf6jkV8UU<H3swVCj)pFb*>0pE){)^2
z($^^+Of@aLS4^in$1BQVXNQkxtEZFRKZ<e~1EOAWOq4*=1iV7Mot3V3$5rlRp<I3a
zp0hz+L|^g5*~H6`g?`kq%^Z&VO@ZN9_v*`Y%eShp(*^o=-1zJYwHou%&?ArBd-tE`
zd7gjgd7fWp!vNh?O=~13eIcKPN^^F%|LG+^tE`(bdA?%~bC3G|gMsy+Zf2fun4KCc
z4)Zx=lzG}ReCU9OGXrLfkHlx()$WJ4Yj|mTk&@X7zvaxhN~p#fJ6XmvA;8n~5^UA5
z78W*jKw6B?!6=zu9F*Z+ZSK<s`oH(HkPRTP(4F|++H(!Q1@b%fWz#W;_zKG$9e}X(
z;A2(cQk_4OD-j}pM6rbkjm31P4uD&O3VcT_Fb4qI{mOHP0|0<pQ~@4F98~7PO=4MS
zIZ=iG2LJ$gRbwDu+NnefU<R<BkC=b)@zJJpBz-*<ZSJkw(m&@`W-ul5)0yUj!AAJ&
zga`Clpy|&S#$PR3VN3&0e;CIF89cxm;Hsf0WtHo+rSpw{kdu4bNKwm6dh~#^7y<sD
zvc%Wo>jBt7HCE;O{TPy*5L9g+16rNTmuLV+pT)@aoNZdrz-KSN0!jOmXAOW-Fr#t(
zm)kQc;DuTlya<VWuGsqixI>RYfKFMOu1C<Hi;_F9;GTMDvMGQz^wv=;kq0kPP`+h^
z_I!W)a=#dVL@97!h^qsT%A;&NC5Vv$+<tid$}3mqTYENh`R9wH_rIR4QJ-D8oxaNY
z!NbY}-Qt5KrrdOYBU*#j1hiMtGfm0&^H7&(;KfA*0)Set*N@i(0I2MP6#)NivwZ4)
zUYh(2Fir@IY|&5cq;M0?n`SzISyi|Zn4PKLw*~+&3{&^>GbU_Tal-Y%aq>0z0X*kf
e1KMAuz?PJFQxPvBxMz*^Jjk>(9OpOy*R28OVYik5

delta 883
zcmV-(1C0EKCh{d3PiJRS00IC200000003cW00000000QRH2;wrE(~F500031008w9
zWo5BcNDqHuX#fBM0000U=n_;1H8eIc=he2PM!kzClp_Fr1r?DW*FWy(+q&MVV!fyy
zb&J!L(57R&`Ew5N@4R0WBS#&(-TqZB&h_CitXBQQ4%OXAo0YzQD#h{1YL>anKb~~w
zQ9Csi(6&mdE&oEdrvaDvuUok!uS7-vIY(&#j5>b{76Zu9(1|hSMjB$^;SHj%Q#zb#
z2IC9U=}ve>IqY!wc(&RkKfC(QFa|`u;x$nMO%ni|GQFL(s&>aw?qs1{eRGX>3m4H>
zJh9ru%aDbB)UnMRj{8l4;aK<T%X7=Os;|=pdN$mI><YCy`!dj@oZP<q&+|Ob^E}Tl
zVHkgatD4j(lD-g;g)%wr?|*t3%qqBA!OtD%F!$)V|6pJ}&`rzJb1iDDIBcFnfXvfw
z^~)7%tQs=SN8&T?YWKt2HM}&vNXhJk-*RSLB_dd3C(D`%0g8DEwrW_#!j}D-Dg#2v
z{NhlCd$qYw8|eSu*OCpe(4F|++H>`{00R>AWz#W;_zKI61>me$J{Q3XJd-&QB7ekW
z)to#x>L7e_6W<XF%mDz}m9Z)Su%HS6-bKtS^AfvIRz^%v&HDiW0A4s51NqX<CYpg6
zz<NGn{?f-so6eE+^;ER^v})I%%&l}|O6I4t3%(v`guhOBK%WIWb?dkocvTHfI1fDi
zVH_7^@NhnFS?WnD*J(?~jeyBLZGYqeEf4QmW}U?d@PEY;UyH8?U<cJ$mGAdsNOD3@
z+CBy}k<6zWfYE0$yq>d73mW+B<yRnSfAXvWPzq)=uK#j-MkRQmc7YqA;Q3s!_0^9%
z^cV!_l%?r<1pT=vx$_F{sfQ+;0%${fN3D#}(Ez?>WXk$|=j8cd5T(F@A%Ct;0i^OM
zn?wmR!~ph>_E%oHGT+*>*;jx5bM*fIvo-3oEw|HGSwDEx<muhwgC(ZibbljSgVqG>
z5IxhBd_NE6Kcl<2h+qOx>-GBaniybI_8}?&{@G^v)cw3P`59oG5Ej{@pV~>`CY(3T
zbO5v1SRxP}DCPI90RY3){V4p5f$b_bt`ClrufY%CInMz0AKFM^!j$7hfLz~ScUK9=
J84hsW8UWslup9sY

diff --git a/buildnumber.txt b/buildnumber.txt
index 3081bd86..196a78e0 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2667
\ No newline at end of file
+2670
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 3ab00714..074fd7d3 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -34,6 +34,7 @@ class Charter extends UIState {
     public var topMenuSpr:UITopMenu;
     public var gridBackdrop:CharterBackdrop;
     public var gridBackdropDummy:CharterBackdropDummy;
+	public var conductorFollowerSpr:FlxSprite;
 
 	public var hitsound:FlxSound;
 	public var metronome:FlxSound;
@@ -145,14 +146,17 @@ class Charter extends UIState {
                     },
                     null,
                     {
-                        label: "Go back a section"
+                        label: "Go back a section",
+						onSelect: _playback_back
                     },
                     {
-                        label: "Go forward a section"
+                        label: "Go forward a section",
+						onSelect: _playback_forward
                     },
                     null,
                     {
-                        label: "Go back to the start"
+                        label: "Go back to the start",
+						onSelect: _playback_start
                     },
                     null,
                     {
@@ -185,7 +189,11 @@ class Charter extends UIState {
 		selectionBox.scrollFactor.set(1, 1);
 		selectionBox.incorporeal = true;
 
-		selectionBox.cameras = notesGroup.cameras = gridBackdrop.cameras = [charterCamera];
+		conductorFollowerSpr = new FlxSprite(0, 0).makeGraphic(1, 1, -1);
+		conductorFollowerSpr.scale.set(gridBackdrop.strumlinesAmount * 4 * 40, 4);
+		conductorFollowerSpr.updateHitbox();
+
+		conductorFollowerSpr.cameras = selectionBox.cameras = notesGroup.cameras = gridBackdrop.cameras = [charterCamera];
 
 
         topMenuSpr = new UITopMenu(topMenu);
@@ -195,6 +203,7 @@ class Charter extends UIState {
         // adds grid and notes so that they're ALWAYS behind the UI
         add(gridBackdrop);
         add(notesGroup);
+		add(conductorFollowerSpr);
 		add(selectionBox);
         // add the ui group
         add(uiGroup);
@@ -397,6 +406,8 @@ class Charter extends UIState {
 	public inline function sortNotes()
 		notesGroup.sort((i, c1, c2) -> FlxSort.byValues(i, c1.step, c2.step), FlxSort.ASCENDING);
 	#end
+
+	var __crochet:Float;
     public override function update(elapsed:Float) {
         // TODO: do optimization like NoteGroup
 		updateNoteLogic(elapsed);
@@ -419,7 +430,24 @@ class Charter extends UIState {
 
 			if (FlxG.keys.justPressed.SPACE)
 				_playback_play(null);
+
+			__crochet = ((60 / Conductor.bpm) * 1000);
+			Conductor.songPosition -= __crochet * FlxG.mouse.wheel;
+
+			if (FlxG.keys.justPressed.D)
+				_playback_forward(null);
+			if (FlxG.keys.justPressed.A)
+				_playback_back(null);
+			if (FlxG.keys.justPressed.HOME)
+				_playback_start(null);
+			if (FlxG.keys.justPressed.END)
+				_playback_end(null);
         }
+
+		Conductor.songPosition = FlxMath.bound(Conductor.songPosition, 0, FlxG.sound.music.length);
+
+		conductorFollowerSpr.y = curStepFloat * 40;
+		charterCamera.scroll.set(conductorFollowerSpr.x + conductorFollowerSpr.scale.x - (FlxG.width / 2), conductorFollowerSpr.y - (FlxG.height * 0.25));
     }
 
 
@@ -432,6 +460,18 @@ class Charter extends UIState {
         if (selection == null) return;
 		selection = deleteNotes(selection);
     }
+	function _playback_back(_) {
+		Conductor.songPosition -= Conductor.beatsPerMesure * __crochet;
+	}
+	function _playback_forward(_) {
+		Conductor.songPosition += Conductor.beatsPerMesure * __crochet;
+	}
+	function _playback_start(_) {
+		Conductor.songPosition = 0;
+	}
+	function _playback_end(_) {
+		Conductor.songPosition = FlxG.sound.music.time;
+	}
     #end
 }
 

From a55e6eba38a463c04bb0dbc0b0ea658ec01c0597 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Wed, 22 Mar 2023 23:37:03 +0100
Subject: [PATCH 5/7] metronome file update

---
 assets/sounds/editors/charter/metronome.mp3 | Bin 1989 -> 2041 bytes
 assets/sounds/editors/charter/metronome.ogg | Bin 4871 -> 4867 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/sounds/editors/charter/metronome.mp3 b/assets/sounds/editors/charter/metronome.mp3
index 30dbfa8f9205aa128784cd8451d1408202fe36d0..4a823020b466fe515a6bfa899fc1bf96a23d1df5 100644
GIT binary patch
delta 1066
zcmX@g|C4`0yzxGU4jf=JE--OYDC@qp5!?1o{P=njBWwNt-xrQBFmQ=5H*XPO(0*?H
zcDv~WkBLhhyfU>Xy<=c^=VxGGFlM%4^#AbT>kc4WPVWEr1O~;2|9?pSfB5+S|Nmd)
z<mzAl|NHRa!<P)Q|KxyR0#F%)js1Th$;o{9`2Qaa>=UP)-O0k~m-ViwlP8IxX{J{G
z%a%;mjyS3MB%VEYHG?j9NmhziTo#t(De{w;m^O9c62)Z)+EcldSZA&)`<~L*=#!Mx
zy6ep~r#0dFYg*0nQ+x&6Zq9GZ-}j||bIYIB=8!dMQGXO#AGGd%GmWw7;mzXWJRhk^
ze?8`G{kb*jTFIr(TAr>g`>LW@R^?>wo30)B^Q?c|Y5Q}1d+Lu_JU-v^xjeJZ);jL1
z>9751clX7d4+#-n@pN16<Nv-|r@21eDgXcdWm<ls&c>we_fLI|sV<iD+W0J@{`KC|
zy5Bj=Layzfy6N54tY;tp)z^Q&_a77}U~sqG?&{LothHMs1C2SJ?DBN$d9Rg_F*$PS
z;-Y4QjIM+O2E5zr*M8l&(ZZBJY$=!8spQ5pF_T%^MG9W@rq9@sJ=4t1X!H8F=9{)&
zFW7V9;ManAOV;xr(YgQUV|*|x*Va!bS*HipIBe9>dZ6`6EMsR()RL_wJGvXR9j|TQ
zU@XAEpdUJU>IqQ>!wWgfI8C~3QdIVbr7v}eJacP{((0(`_jfX<YSq`zPn$Jk!{ax+
zVosVxXSL*wru|*EO6Ye+-c*s}e}0D_=3AqAAarKnsne29s|AwQ+|~B-Z*Z9F*~7x>
zBPjlM*8L?CoSw`7f9adFIw$qbk$V1Xt?mECRnPzO(cmsP_`GFl$p7uOy+y4COae~|
zmbxCVIwQu^W5AqwX{Yq8oOK5_tgQbm9DT0(wfYJP*7C0Ag`ML3$L1a8HuV&6I<!bo
zU87c6LAq0AY4Dt~qlXn;uf}Ff&X2i$+EJ-6E4hEtad}OpUF*I7@MyeRCz<KaBmXg%
zODngmzqa1AUi3&$rRS`+@ALo7y|&ud{f3$9`zua`Vv2T^k`p7MoR?aKaw<$@R@hP>
zp~M1ArwKa*r|fomC|MyNQ=oC^pd{ZGhqj8-4;BPY$p7Ht$n4s3uFIX-NbSJ2g%?^j
z$#c3CSD3vtkldIku4&>g9LLezc)9)m?}Q^C8~9varvGhWP%<{isGQO_qs61?lB<e(
zB4_tf{hop~+yyU%l!HD^G77BzRFdjBagm8(m$KHRi>?{}Cp>=UcC2OPF3*2k0{<_|
znAys$ma<nj{{PFZ=Wd!=am`QT`u|0Zt^9x1<a}1$$p=_vC(mIG5&i$W;m9inA;pQ#
cU#Bo=O<I+{-#o}+vm=`fBT$LW<XH9$0A_0fxBvhE

delta 1037
zcmey#f0Tbhym1#pFAlI17nnFHl(lQkjMn`VKfa#C$XfsZ_k|-23|t$S8@C8B=rCHp
zEjL}@F>#WESElx)cMR-datsU%X>1h?{U1JjnFD0=^Vk2Jz`$ZA|G%OCKR^Hf|Njrz
z*x1zV|9?+TPELX${YOPbMU?|kA;X9NUmAcE<HLvV|1mJs|M>Tqi_@BiWy#i<r$Q1(
z3>tiv&N#tXuOg<{ki}_G9FW^IXCn8B11;t!-5sQZ*jOZIdN64u9cRuGVUyEZ_<HW%
zo6N?1nN~-fqf38Vom?01*z{BXMzBllwv_xezrClJEDQP5%D6&Xa%q=F4x@7UO&zAM
z`!{@HXSBF7{gun3b!%6y4tu#&=$E8u#-6UIFDuN9-Y-3MrLMj>`1+>vuP<Joaa^YI
z<Gj4L`bU<Sz7LLH{Vn(Q-eTLpfUw2WZf@`YYqDBL`*h*`|M!>n-P@?MF=_k#Q(t59
zuN|MLlb_oDZ}*)|=XZE-TDJAi+UcdML!^)Y{QLiY_5Xfg=zu}#o!?<ozy4pk_DDsd
zF{kb>&xR+9#2#=q=6KW}zi7o~SgNQ!d7EWh-H{UooRY_zdoQn4@bkICB~$R!xN?5(
z)~Ihijk2a0&%gYBRbKqszFf0%t^CR5SqlD{92W&v$LmapELA_Hvqqa~-NLjr>vV&n
zcEv~<F-Gxi-P?Gjfq}7V&m29671pv``xwP0S{!vtd@K1fB5b$W4q?%?_1?c%NNX<t
z#Z(v~CR4j0>&nL2SNl|qa^ee0l*^SivowePdZ*4~wP879ShmcXO<Jo3lGfbS_VRCV
znCsc2!8Jok|F-FV&t^@N|NkbgWDV;{eRCr9@WzaY`cJ=}|5X#2e)rhhKCPa@DGH1N
zcXF1xo~}Bm#=)1s_V{UzO)9IJVr_l+nzaj^?nl}>Xo%k7>QM6JJN$9^hC^oqSsYnf
zU6lL+ez`g9IGGwer|i&&6M>oGQ7X6lc5a{6xTr8Itx~7>rP`~#`Y#L?uiBBiRG3Hp
zV=k9gZdreAy=gtSz+$<ew1v|v|G&JOwdG1}b5h)27j?lT;b$soA`wqRKXJD=D?F&F
z&r;?ArqT%<iGmJ}i=;m4l?E6Tus#0g;aAX}x>l0uKd%a_=3K#ZYz9Ag{5d-XR(6U$
z?Db*cvv$#P?tH}h$iwAil0`=64oAiRzY~tUVc@;7GyTtJ1|_i#8I@D`E;4p6DL-Zr
z%d2=vBRS~PBu}^aSrda^3d$Z+Vb#)DEC2D7lwFXS7XQ<N{HfLt9z=QwoB!93Vm|b&
x{{Q<~lP|F90&&RX53FXw1xH>s2zgF+{5pj}OJ8c4xw!+wW=A#^#>o@eGXU}N<ih{}

diff --git a/assets/sounds/editors/charter/metronome.ogg b/assets/sounds/editors/charter/metronome.ogg
index 019d024346c9148eda11412d55e6ed7db3a88b92..e17188640929675898f8b0563997d6ce9e46593d 100644
GIT binary patch
delta 822
zcmV-61Ihe{CW9s#PiJRS00IC200000005*300000001?;%o~v!E)1jz00031002|D
z^uV!HNDqIc2><{B0001+w_ULZHa0gh@z%G@R`rV!2*5#K#qv-Q`TM}s>sz<4cWPcN
zs-tdkx)R#-9&i4f1AO{^QCN;TcDws37w7tLZ2V@$4ul#;+N?DD9Wh98@Zz)I)|)}Q
z`l+FxoXl3L81_;DZL4Iz;S&G#5xXR>L`DBOM`?cmtWFD84Ma3_VN7--4Y7_4Z^-d=
zN(WO-%kCA^>CW+ra@g77muIV|liojyau@@mUU5v6K+^=oLOqQ!s#nEP?qs1{eSM9$
zL0v>&@eQj@ybM|BM-7{EIF_3N!?Etwm*<vmRbQtc02-Iv`0NU`I`h)dBahsB_n+r^
zp68RB5E6g9+yC@3m{r!zm^|Mxhq*_6|G~g|P&YHr*Jh{2io<*k8DyTe3?Dk+;mm*;
z<0J7IceVTB?HXR1UZiAp!f!b<t`e%T#!i;;ObGDwyaZb{tc8V59gr5|b1+Kg7YAjy
zSDX8^f&TCPOtJwMx)a}9d#=H^Kz^sbY&r%JUtw37qXQ6@hPSH1r8<AQDZj7IttOW&
zqUQXzz|JbwergUZ?|$C2WI#*FW-t5B(TQRU5gLo>OdSBX1{L^@SYQqSwELCu!vTN=
zRRBIl98~7Pjbd47IYE<!5hfS9F(vcUS;B{djqukA59qT%)1NPlKQ5EP5kP+z8i3Jf
zF>*a;n-(<i*~_m$(*ERG1E3VlXk7p0_KXU6p;iVjLL#3lw!S~^&|?swQ<kRd5%lMx
z<jyO&ryiPY3ZM<Wb<|4a!Alf8-erXL^t^q!UreGDI55Q30Z8RhHl7m1$N+91@0TuJ
z%C`1w_SK&+j^6)zwnlw+<#vDiD(eRiD-U#w50;p6)BTNT4O$bhSJ5*~$@lY6muKMR
zA_4(Gt=H?vYhr*=*=Je-@Xt2Or|#$FmY)H}31N{f`l+21Zo+xfOb0Nl3O53?Gxht{
z0DxiYetyQlb`=}f2gk|R;0N%WXANk7l>%E*^rj+SL~zd<>v@oAX*dSXaR9Dc0|k(Z
Av;Y7A

delta 825
zcmV-91IGM=CWj^(PiJRS00IC200000003WW00000008gYV(O6^E(~9500031003+N
z<)N`uNDqHsYXATO0001C*SEL_H#avi^VYb;UOlS~K>&`{SC)rL^D%MY-|gGiJ2fvB
z)ls)NT?uV^k2inL0-wHJgypDSxAIBfgA!urFbvFMz1@gV!$_NzX1^l_DIU&S4YKYA
z?b=Tb{p4h}QpK>B3h1#)_8TtoUmx)-$tzLOf6jkV8UU<H3swVCj)pFb*>0pE){)^2
z($^^+Of@aLS4^in$1BQVXNQkxtEZFRKZ<e~1EOAWOq4*=1iV7Mot3V3$5rlRp<I3a
zp0hz+L|^g5*~H6`g?`kq%^Z&VO@ZN9_v*`Y%eShp(*^o=-1zJYwHou%&?ArBd-tE`
zd7hJ*5EFlPxBuxSKdY>pF?qgY4s(zC{)2(_pl)WKZ<w7LD-QEHWR!W@GJNQOhcg3a
zjE}@;+|}-fw`+K5dXbXZ3BTpcxJszT8ar9WGa<m!^Ac>;uof0JbwFB-&%r2}UmTR-
zUTyBv2KvAEvyct2(4F|++H(!Q1@b%fWz#W;_zGFe936nL^x$Jv;ZmJH-IU)~=T?(T
z7EyD4TVQ9EYCkmxmUlmIS~8%eWV4rj=jcSSg$Rwsbfyk~TZ0OGM=UT00NVY^bB6-}
zfLc@m9!4Bg=D|&3S!g*?lY$W@7iKUe^V6B;gTY4l>x2jNS)l397sg*LlfMx_f0t+g
zMxVvV^_*>5(7<OezXD17lV=TpQZS=&{g>M_D&U1$8N3LIe6HB~{<uSrL4ZzKnyyFC
zpNo<^ui&0~XtF7QHuTm}E0G5;QBb~Rg!X)Y`*Ob+L@97!h^qsT%A;&NC5Vv$+<tid
z$}3mqTYENh`R9wH_rIR4QJ-D8f1SR{`oY7>1Kr|-C8peTe<NCh)&#Uy(KAiS_w!Jf
zXW+#}1Ok9suh);)1OTY)gB1Y(Y_ojoeqNgV3@}azi)_(P?WAxM&YNaBfLT?z5tyB+
z-?s(;3{&^>GbU_Tal-Y%aq>0z0X*kf1KMAuz?PJFQxPvBxMz*^Jjk>(2OQ@(0N1Sn
DROXMm


From c2b64d7ec3553d72749c270dc497f54a1d206dd9 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Thu, 23 Mar 2023 12:34:31 +0100
Subject: [PATCH 6/7] GRAAAAAAAAAAAAAAH! selection box bs

---
 buildnumber.txt                          |  2 +-
 source/funkin/editors/charter/Charter.hx | 32 +++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index 196a78e0..e39b4bbb 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2670
\ No newline at end of file
+2673
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index 074fd7d3..206107eb 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -250,6 +250,8 @@ class Charter extends UIState {
                 if (FlxG.mouse.justReleased) {
                     if (FlxG.keys.pressed.CONTROL)
                         selection.push(n);
+                    else if (FlxG.keys.pressed.SHIFT)
+                        selection.remove(n);
                     else
                         selection = [n];
                 }
@@ -282,16 +284,28 @@ class Charter extends UIState {
 			}
 			if (FlxG.mouse.justReleased) {
 				if (selectionBoxEnabled) {
-					var minX = Std.int(Math.round(selectionBox.x / 40));
-					var minY = Math.round(selectionBox.y / 40) - 1;
-					var maxX = Std.int(Math.round((selectionBox.x + selectionBox.bWidth) / 40));
-					var maxY = Math.round((selectionBox.y + selectionBox.bHeight) / 40);
+					var minX = Std.int(selectionBox.x / 40);
+					var minY = Std.int(selectionBox.y / 40);
+					var maxX = Std.int(Math.ceil((selectionBox.x + selectionBox.bWidth) / 40));
+					var maxY = Math.ceil((selectionBox.y + selectionBox.bHeight) / 40);
 
-					selection = [];
-					notesGroup.forEach(function(n) {
-						if (n.id >= minX && n.id <= maxX && n.step >= minY && n.step <= maxY)
-							selection.push(n);
-					});
+					if (FlxG.keys.pressed.SHIFT) {
+						notesGroup.forEach(function(n) {
+							if (n.id >= minX && n.id < maxX && n.step >= minY && n.step < maxY && selection.contains(n))
+								selection.remove(n);
+						});
+					} else if (FlxG.keys.pressed.CONTROL) {
+						notesGroup.forEach(function(n) {
+							if (n.id >= minX && n.id < maxX && n.step >= minY && n.step < maxY && !selection.contains(n))
+								selection.push(n);
+						});
+					} else {
+						selection = [];
+						notesGroup.forEach(function(n) {
+							if (n.id >= minX && n.id < maxX && n.step >= minY && n.step < maxY)
+								selection.push(n);
+						});
+					}
 
 					selectionBoxEnabled = false;
 				} else {

From 18c107ab0aa092b608a060647e1ad05e34b93984 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Thu, 23 Mar 2023 12:51:27 +0100
Subject: [PATCH 7/7] git commit number (UNFINISHED)

---
 buildnumber.txt                        |  2 +-
 source/funkin/macros/GitCommitMacro.hx | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 source/funkin/macros/GitCommitMacro.hx

diff --git a/buildnumber.txt b/buildnumber.txt
index e39b4bbb..d98ffe80 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2673
\ No newline at end of file
+2674
\ No newline at end of file
diff --git a/source/funkin/macros/GitCommitMacro.hx b/source/funkin/macros/GitCommitMacro.hx
new file mode 100644
index 00000000..b7227ba7
--- /dev/null
+++ b/source/funkin/macros/GitCommitMacro.hx
@@ -0,0 +1,16 @@
+package funkin.macros;
+
+class GitCommitMacro {
+	public static macro function getCommitNumber() {
+		#if display
+		return macro $v{0};
+		#else
+		var proc = new Process('git', ['rev-list', 'HEAD', '--count'], false);
+		proc.exitCode(true);
+
+		var c = Std.parseInt(proc.stdout.readLine());
+		trace(c);
+		return macro $v{c};
+		#end
+	}
+}
\ No newline at end of file