i uhhhh mmmhmmm

Project.xml

@@ -3,7 +3,7 @@
 
 	<!-- [ Application Settings ] -->
 
-	<app title="Rhythmo" file="Rhythmo" main="Main" version="0.3.0" company="Joalor64" />
+	<app title="Rhythmo" file="Rhythmo" main="Main" version="0.3.5" company="Joalor64" />
 
 	<!-- [ Window Settings ] -->
 

TODO.md

@@ -5,7 +5,7 @@
 * [ ] Improve ChartingState
 
 # Future To-Dos (After release)
-* Polymod support (or modding support in general)
+* Modding Support (Using Polymod)
 * Maybe a few more songs
 * Achievements
 * Custom Skins

docs/01 - scripting.md

@@ -1,5 +1,5 @@
 # How to Use the Scripting System
-This will teach you how to use Rhythmo's special scripting system. Basically, you can use this to make custom backgrounds, add special functions, etc.
+This will teach you how to use Rhythmo's special scripting system. Basically, you can use this to make custom backgrounds, add special functions, make cool mechanics, etc.
 
 Your script should either be located in `assets/scripts/[name].hxs`, or in `assets/songs/[your-song]/script.hxs`.
 

docs/02 - adding-a-custom-song.md

@@ -24,7 +24,18 @@ For song data, you need the following:
 * `assets/songs/[song-name]/script.hxs` (Optional)
 
 ## Charting
-Lastly, to chart your song, go to PlayState and then press "7" to go to ChartingState. <br>
+Before you actually chart your song, you need `chart.json`.
+Use this template:
+```json
+{
+    "song": "Song Name",
+    "notes": [],
+    "bpm": 100,
+    "timeSignature": [4, 4]
+}
+```
+
+Now, to chart your song, go to PlayState and then press "7" to go to ChartingState. <br>
 When you're done, simply save the chart. It should save in `assets/songs/[song-name]/chart.json`.
 
-You might have to manually change the BPM and time signature.
+Also, you'll have to manually change the BPM and time signature beforehand.

gitVersion.json

@@ -1,4 +1,4 @@
 {
-	"version":"0.3.0",
+	"version":"0.3.5",
 	"description":"Lorem ipsum..."
 }

source/states/MenuState.hx

@@ -42,6 +42,8 @@ class MenuState extends ExtendableState {
 		if (Input.is("accept")) {
 			if (selections[curSelected] == 'exit') {
 				FlxG.sound.play(Paths.sound('cancel'));
+				if (FlxG.sound.music != null)
+					FlxG.sound.music.fadeOut(0.3);
 				FlxG.camera.fade(FlxColor.BLACK, 0.5, false, () -> {
 					#if sys
 					Sys.exit(0);

source/states/OptionsState.hx

@@ -16,7 +16,7 @@ class OptionsState extends ExtendableState {
 	var curSelected:Int = 0;
 	var daText:FlxText;
 
-	var checkerArray:Array<Checker> = []; // wip
+	var checkerArray:Array<Checker> = [];
 
 	override function create() {
 		super.create();
@@ -36,6 +36,13 @@ class OptionsState extends ExtendableState {
 			optionTxt.setFormat(Paths.font('vcr.ttf'), 60, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 			optionTxt.ID = i;
 			grpOptions.add(optionTxt);
+
+			if (i < 5) {
+				var checker:Checker = new Checker(0, 0, getOptionState(i));
+				checker.sprTracker = optionTxt;
+				checkerArray.push(checker);
+				add(checker);
+			}
 		}
 
 		daText = new FlxText(5, FlxG.height - 24, 0, "", 12);
@@ -96,6 +103,9 @@ class OptionsState extends ExtendableState {
 					openSubState(new LanguageSubState());
 			}
 
+			for (i in 0...checkerArray.length)
+				checkerArray[i].checked = getOptionState(i);
+
 			updateText();
 		}
 

source/states/PlayState.hx

@@ -385,12 +385,15 @@ class PlayState extends ExtendableState {
 						seperatedScore.push(Std.parseInt(comboSplit[i]));
 
 					var daLoop:Int = 0;
+
+					remove(ratingDisplay, true);
+
 					for (i in seperatedScore) {
 						var numScore:FlxSprite = new FlxSprite(0, 0);
 						numScore.loadGraphic(Paths.image('ui/num' + Std.int(i)));
 						numScore.scale.set(0.5, 0.5);
 						numScore.screenCenter();
-						numScore.x = (FlxG.width * 0.55) + (43 * daLoop) - 90;
+						numScore.x = (FlxG.width * 0.55) + (43 * daLoop) - 100;
 						numScore.y = ratingDisplay.y + 80;
 						numScore.acceleration.y = FlxG.random.int(200, 300);
 						numScore.velocity.y -= FlxG.random.int(140, 160);
@@ -407,6 +410,8 @@ class PlayState extends ExtendableState {
 						daLoop++;
 					}
 
+					add(ratingDisplay);
+
 					note.active = false;
 					notes.remove(note);
 					note.kill();
@@ -492,6 +497,8 @@ class PlayState extends ExtendableState {
 		scriptArray = [];
 		callOnScripts('destroy', []);
 
+		instance = null;
+
 		super.destroy();
 	}
 

source/states/SongSelectState.hx

@@ -108,7 +108,8 @@ class SongSelectState extends ExtendableState {
 		if (Input.is("accept")) {
 			PlayState.song = Song.loadSongfromJson(Paths.formatToSongPath(songListData.songs[currentIndex].name));
 			ExtendableState.switchState(new PlayState());
-			FlxG.sound.music.stop();
+			if (FlxG.sound.music != null)
+				FlxG.sound.music.stop();
 		}
 	}
 

source/substates/PauseSubState.hx

@@ -26,6 +26,10 @@ class PauseSubState extends ExtendableSubState {
 			ExtendableState.switchState(new MenuState());
 			FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'), 0.75);
 			PlayState.chartingMode = false;
+		} else if (Input.is("backspace")) {
+			ExtendableState.switchState(new SongSelectState());
+			FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'), 0.75);
+			PlayState.chartingMode = false;
 		} else if (Input.is("r"))
 			ExtendableState.resetState();
 		else if (Input.is("accept"))