Added marvelous

source/ClientPrefs.hx

@@ -78,6 +78,7 @@ class ClientPrefs
 	public static var sickWindow:Int = 45;
 	public static var goodWindow:Int = 90;
 	public static var badWindow:Int = 135;
+	public static var marvelousWindow:Int = 25;
 	public static var safeFrames:Float = 10;
 	public static var instantRespawn:Bool = false;
 
@@ -362,6 +363,9 @@ class ClientPrefs
 		{
 			badWindow = FlxG.save.data.badWindow;
 		}
+		if(FlxG.save.data.marvelousWindow != null)
+			marvelousWindow = FlxG.save.data.marvelousWindow;
+
 		if(FlxG.save.data.autoPause != null)
 		{
 			autoPause = FlxG.save.data.autoPause;

source/Conductor.hx

@@ -166,7 +166,7 @@ class Rating
 	public var counter:String = '';
 	public var hitWindow:Null<Int> = 0; //ms
 	public var ratingMod:Float = 1;
-	public var score:Int = 350;
+	public var score:Int = 500;
 	public var noteSplash:Bool = true;
 
 	public function new(name:String)

source/PlayState.hx

@@ -198,6 +198,7 @@ class PlayState extends MusicBeatState
 	public var timeBar:FlxBar;
 
 	public var ratingsData:Array<Rating> = [];
+	public var marvelous:Int = 0;
 	public var sicks:Int = 0;
 	public var goods:Int = 0;
 	public var bads:Int = 0;
@@ -372,7 +373,12 @@ class PlayState extends MusicBeatState
 		];
 
 		//Ratings
-		ratingsData.push(new Rating('sick')); //default rating
+		ratingsData.push(new Rating('marvelous')); // default rating
+
+		var rating:Rating = new Rating('sick');
+			rating.score = 350;
+			rating.ratingMod = 0.9;
+		ratingsData.push(rating);
 
 		var rating:Rating = new Rating('good');
 			rating.ratingMod = 0.7;
@@ -1195,7 +1201,7 @@ class PlayState extends MusicBeatState
 			judgementCounter.scrollFactor.set();
 			judgementCounter.cameras = [camHUD];
 			judgementCounter.screenCenter(Y);
-			judgementCounter.text = 'Sicks: ${sicks}\nGoods: ${goods}\nBads: ${bads}\nShits: ${shits}\n';//\nTotal hit: ${totals}\n';
+			judgementCounter.text = 'Marvelous: ${marvelous}\nSicks: ${sicks}\nGoods: ${goods}\nBads: ${bads}\nShits: ${shits}\n';//\nTotal hit: ${totals}\n';
 			add(judgementCounter);
 		}
 
@@ -5769,7 +5775,7 @@ class PlayState extends MusicBeatState
 		setOnLuas('ratingName', ratingName);
 		setOnLuas('ratingFC', ratingFC);
 		if (ClientPrefs.crazycounter) {
-			judgementCounter.text = 'Sicks: ${sicks}\nGoods: ${goods}\nBads: ${bads}\nShits: ${shits}\n';//\nTotal hit: ${totals}\n;
+			judgementCounter.text = 'Marvelous: $marvelous\nSicks: $sicks\nGoods: $goods\nBads: $bads\nShits: $shits\n';//\nTotal hit: ${totals}\n;
 		}
 	}
 

source/options/GameplaySettingsSubState.hx

@@ -106,7 +106,7 @@ class GameplaySettingsSubState extends BaseOptionsMenu
 			'bool',
 			false);
 		addOption(option);
-	
+
 		var option:Option = new Option('Rating Offset',
 			'Changes how late/early you have to hit for a "Sick!"\nHigher values mean you have to hit later.',
 			'ratingOffset',
@@ -118,6 +118,17 @@ class GameplaySettingsSubState extends BaseOptionsMenu
 		option.maxValue = 30;
 		addOption(option);
 
+		var option:Option = new Option('Marvelous! Hit Window',
+			'Changes the amount of time you have\nfor hitting a "Marvelous" in milliseconds.',
+			'marvelousWindow',
+			'int',
+			25);
+		option.displayFormat = '%vms';
+		option.scrollSpeed = 15;
+		option.minValue = 10;
+		option.maxValue = 20;
+		addOption(option);
+
 		var option:Option = new Option('Sick! Hit Window',
 			'Changes the amount of time you have\nfor hitting a "Sick!" in milliseconds.',
 			'sickWindow',