From e30a0cc1ed8e0ad09377a851e11b849caeeb2c9e Mon Sep 17 00:00:00 2001
From: Joshua Sigona <sigonasr2@gmail.com>
Date: Thu, 7 Oct 2021 21:23:01 +0900
Subject: [PATCH] Scale note sizes as they approach the note scoring sections

---
 LLSIG/src/main/java/LLSIG/Canvas.java | 4 +++-
 LLSIG/src/main/java/LLSIG/LLSIG.java  | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/LLSIG/src/main/java/LLSIG/Canvas.java b/LLSIG/src/main/java/LLSIG/Canvas.java
index bae05d0..8e07b5a 100644
--- a/LLSIG/src/main/java/LLSIG/Canvas.java
+++ b/LLSIG/src/main/java/LLSIG/Canvas.java
@@ -46,8 +46,10 @@ public class Canvas extends JPanel{
 				int noteCounter = 0;
 				while (lane.noteExists(noteCounter)) {
 					Note n = lane.getNote(noteCounter);
+					double PLAYTIME_RATIO = (1-(((double)n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition())/LLSIG.game.NOTE_SPEED));
 					if (n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition()<LLSIG.game.NOTE_SPEED) {
-						g.fillOval((int)(MIDDLE_X-Math.cos(Math.toRadians(22.5*i))*((1-(((double)n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition())/LLSIG.game.NOTE_SPEED))*NOTE_DISTANCE)-NOTE_SIZE/2),(int)(MIDDLE_Y+Math.sin(Math.toRadians(22.5*i))*((1-(((double)n.getStartFrame()-LLSIG.game.musicPlayer.getPlayPosition())/LLSIG.game.NOTE_SPEED))*NOTE_DISTANCE)-NOTE_SIZE/2),NOTE_SIZE,NOTE_SIZE);
+						g.fillOval((int)(MIDDLE_X-Math.cos(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),(int)(MIDDLE_Y+Math.sin(Math.toRadians(22.5*i))*(PLAYTIME_RATIO*NOTE_DISTANCE)-NOTE_SIZE/2),
+								(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE),(int)(Math.min(PLAYTIME_RATIO/2+0.5,1)*NOTE_SIZE));
 					}
 					noteCounter++;
 				}
diff --git a/LLSIG/src/main/java/LLSIG/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java
index 8010cc7..666c35c 100644
--- a/LLSIG/src/main/java/LLSIG/LLSIG.java
+++ b/LLSIG/src/main/java/LLSIG/LLSIG.java
@@ -21,12 +21,12 @@ public class LLSIG implements KeyListener{
 	ScheduledThreadPoolExecutor stpe = new ScheduledThreadPoolExecutor(1);
 	int frameCount;
 	public static LLSIG game;
-	int NOTE_SPEED = 1000; //The note speed determines how early you see the note. So lowering this number increases the speed.
+	int NOTE_SPEED = 850; //The note speed determines how early you see the note. So lowering this number increases the speed.
 	List<Lane> lanes = new ArrayList<Lane>();
 	
 	String song = "MiChi - ONE-315959669";
 	
-	final static Dimension WINDOW_SIZE = new Dimension(1024,800);
+	final static Dimension WINDOW_SIZE = new Dimension(1280,1050);
 	
 	public boolean EDITMODE = true;
 	public boolean PLAYING = false; //Whether or not a song is loaded and playing.
@@ -136,7 +136,7 @@ public class LLSIG implements KeyListener{
 			case KeyEvent.VK_L:{lane=7;}break;
 			case KeyEvent.VK_SEMICOLON:{lane=8;}break;
 			case KeyEvent.VK_P:{if (LLSIG.game.PLAYING&&musicPlayer.isPaused()) {musicPlayer.resume();} else {musicPlayer.pause();}}break;
-			case KeyEvent.VK_Q:{if (LLSIG.game.PLAYING) {musicPlayer.pause();SaveSongData("music/"+song+".sig",lanes);}}break;
+			case KeyEvent.VK_Q:{if (LLSIG.game.PLAYING) {musicPlayer.pause();SaveSongData(song,lanes);}}break;
 		}
 		if (LLSIG.game.PLAYING&&lane!=-1) {
 			LLSIG.game.lanes.get(lane).addNote(new Note(NoteType.NORMAL,musicPlayer.getPlayPosition()));