2.2 release merge.

2.2 release merge.

Project.xml

@@ -4,7 +4,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Dash OVERLORD" file="DashOVERLORD" main="Main" version="2.1" company="Bogdan2D" />
+	<app title="Dash OVERLORD" file="DashOVERLORD" main="Main" version="2.2" company="Bogdan2D" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->

assets/data/levels/levelData.txt

@@ -0,0 +1,2 @@
+9
+0.2

source/LevelButton.hx

@@ -26,8 +26,6 @@ class LevelButton extends FlxSpriteGroup
 		{
 			case 'Level 0':
 				daText.text = 'TUTORIAL';
-			case 'Level 10':
-				daText.text = 'ESCAPE';
 		}
 
 		add(daText);

source/LostSoul.hx

@@ -40,6 +40,10 @@ class LostSoul extends FlxSprite
 			flipX = false;
 			hitboxFix();
 		}
+		if (isTouching(FlxObject.UP) && isTouching(FlxObject.FLOOR))
+		{
+			velocity.y = -PlayState.GRAVITY / 3;
+		}
 
 		super.update(elapsed);
 	}

source/states/IntroState.hx

@@ -18,6 +18,8 @@ class IntroState extends FlxState
 
 	override public function create()
 	{
+		MainMenuState.firstPlay = true;
+		FlxG.mouse.visible = false;
 		new NGio(SecretHA.ID, SecretHA.ENC_KEY);
 
 		FlxG.fixedTimestep = false;
@@ -29,6 +31,7 @@ class IntroState extends FlxState
 		myName = new FlxText(0, 0, FlxG.width, Application.current.meta.get('company'));
 		myName.setFormat('assets/data/fonts/karma.TTF', 80, FlxColor.WHITE, CENTER);
 		myName.setBorderStyle(FlxTextBorderStyle.OUTLINE, FlxColor.BLACK, 5);
+		myName.antialiasing = true;
 
 		myName.screenCenter();
 		myName.bold = true;
@@ -46,6 +49,9 @@ class IntroState extends FlxState
 	override public function update(elapsed)
 	{
 		super.update(elapsed);
+
+		if (FlxG.keys.justPressed.F)
+			FlxG.fullscreen = !FlxG.fullscreen;
 	}
 
 	function rollIntro()

source/states/LevelSelectState.hx

@@ -17,7 +17,7 @@ class LevelSelectState extends FlxState
 	var fade:FlxSprite;
 	var title:FlxText;
 	var lvGroup:FlxTypedGroup<LevelButton>;
-	var levels:Int = Std.parseInt(Assets.getText('assets/data/levels/levels.txt')); // if you put a letter in that text file you sinned >:(
+	var levels:Int = Std.parseInt(TextUtil.arrayifyTextFile('assets/data/levels/levelData.txt')[0]); // if you put a letter in that text file you sinned >:(
 
 	override public function create()
 	{
@@ -100,7 +100,7 @@ class LevelSelectState extends FlxState
 
 	function changeSelectedLv(skips:Int)
 	{
-		var moveBy:Float = 0.2;
+		var moveBy:Float = Std.parseFloat(TextUtil.arrayifyTextFile('assets/data/levels/levelData.txt')[1]); // Higher number means it scrolls more
 		if (UIusable)
 		{
 			curSelected += skips;

source/states/MainMenuState.hx

@@ -13,6 +13,8 @@ import lime.app.Application;
 
 class MainMenuState extends FlxState
 {
+	public static var firstPlay:Bool;
+
 	var UIusable:Bool;
 	var fade:FlxSprite;
 	var daG:FlxSprite;
@@ -102,14 +104,23 @@ class MainMenuState extends FlxState
 						PlayState.deaths = 0;
 						PlayState.fromLvSelect = false;
 						PlayState.LevelID = 0;
-						FlxG.sound.play('assets/sounds/CUT.ogg');
-						camera.bgColor = FlxColor.BLACK;
-						forEach(function(spr) remove(spr));
 
-						camera.flash(FlxColor.WHITE, 5, function()
+						if (firstPlay)
 						{
-							FlxG.switchState(new PlayState());
-						});
+							firstPlay = false;
+							FlxG.sound.play('assets/sounds/CUT.ogg');
+							camera.bgColor = FlxColor.BLACK;
+							forEach(function(spr) remove(spr));
+							camera.flash(FlxColor.WHITE, 5, function()
+							{
+								FlxG.switchState(new PlayState());
+							});
+						}
+						else
+						{
+							FlxG.sound.play('assets/sounds/confirm.ogg');
+							camera.fade(FlxColor.BLACK, 0.5, false, function() FlxG.switchState(new PlayState()));
+						}
 
 					case 'level select':
 						FlxG.sound.play('assets/sounds/confirm.ogg');

source/states/PlayState.hx

@@ -22,7 +22,7 @@ class PlayState extends FlxState
 	// public static var hasDied:Bool;
 	public static var fromLvSelect:Bool;
 
-	var maxLevels:Int = Std.parseInt(Assets.getText('assets/data/levels/levels.txt'));
+	var maxLevels:Int = Std.parseInt(TextUtil.arrayifyTextFile('assets/data/levels/levelData.txt')[0]);
 	var canTP:Bool;
 	var exitDoorDebounce:Bool;
 
@@ -349,8 +349,7 @@ class PlayState extends FlxState
 				player.animation.play('wake', true);
 				GameCam.zoom = 2;
 				GameCam.y -= 100;
-				GameCam.scroll.x += 100;
-				// new FlxTimer().start(0.01, function(tmr:FlxTimer) FlxG.sound.play('assets/sounds/wakeUp.ogg', 0.5));
+
 				FlxG.sound.play('assets/sounds/wakeUp.ogg', 0.5);
 
 				FlxTween.tween(GameCam, {zoom: 1, y: 0, x: 0}, 7, {