Merge pull request #11 from BrandyBuizel/master

Switch works Pre-Faxe YOLO COMMIT LETS GOOOO
FunkinCrew · Nov 25, 2020 · c70ed68 · c70ed68
2 parents 4e3297c + 2c49696
commit c70ed68
Show file tree

Hide file tree

Showing 70 changed files with 1,937 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry!
 - Difficulty on storymode and in freeplay scores
 - Hard mode difficulty on campaign levels have been fixed
+
 ## [0.2.1.1] - 2020-11-06
 ### Fixed
 - Week 2 not unlocking properly

diff --git a/Preloader.hx b/Preloader.hx
@@ -0,0 +1,57 @@
+package ;
+
+import flixel.system.FlxBasePreloader;
+import openfl.display.Sprite;
+import flash.display.Bitmap;
+import flash.display.BitmapData;
+import flash.display.BlendMode;
+import flash.display.Sprite;
+import flash.Lib;
+import flixel.FlxG;
+
+@:bitmap("art/preloaderArt.png") class LogoImage extends BitmapData { }
+
+class Preloader extends FlxBasePreloader
+{
+    public function new(MinDisplayTime:Float=3, ?AllowedURLs:Array<String>) 
+    {
+        super(MinDisplayTime, AllowedURLs);
+    }
+
+    var logo:Sprite;
+
+    override function create():Void 
+    {
+        this._width = Lib.current.stage.stageWidth;
+        this._height = Lib.current.stage.stageHeight;
+
+        var ratio:Float = this._width / 2560; //This allows us to scale assets depending on the size of the screen.
+
+        logo = new Sprite();
+        logo.addChild(new Bitmap(new LogoImage(0,0))); //Sets the graphic of the sprite to a Bitmap object, which uses our embedded BitmapData class.
+        logo.scaleX = logo.scaleY = ratio;
+        logo.x = ((this._width) / 2) - ((logo.width) / 2);
+        logo.y = (this._height / 2) - ((logo.height) / 2);
+        addChild(logo); //Adds the graphic to the NMEPreloader's buffer.
+
+        super.create();
+    }
+
+    override function update(Percent:Float):Void 
+    {
+        if(Percent < 69)
+        {
+            logo.scaleX += Percent / 1920;
+            logo.scaleY += Percent / 1920;
+            logo.x -= Percent * 0.6;
+            logo.y -= Percent / 2;
+        }else{
+            logo.scaleX = this._width / 1280;
+            logo.scaleY = this._width / 1280;
+            logo.x = ((this._width) / 2) - ((logo.width) / 2);
+            logo.y = (this._height / 2) - ((logo.height) / 2);
+        }
+
+        super.update(Percent);
+    }
+}
diff --git a/Project.xml b/Project.xml
@@ -4,9 +4,12 @@
 
 	<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.2" company="ninjamuffin99" />
 
+	<!--Switch Export with Unique ApplicationID and Icon-->
+	<set name="APP_ID" value="0x0100f6c013bbc000" />
+
 	<!--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"-->
-	<app preloader="flixel.system.FlxPreloader" />
+	<app preloader="Preloader" resizable="true" />
 
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
 	<set name="SWF_VERSION" value="11.8" />
@@ -36,8 +39,8 @@
 
 	<classpath name="source" />
 
-	<assets path="assets/images"/>
-	<assets path="assets/data"/>
+	<assets path="assets/images" />
+	<assets path="assets/data" />
 
 	<!-- <library name="noPreload" preload='false'/> -->
 	<!-- <library name="noPreload"/> -->
@@ -48,8 +51,8 @@
 
 	<assets path="CHANGELOG.md"/>
 
-	<assets path="assets/fonts/vcr.ttf" embed="true" />
 
+	<assets path="assets/fonts/vcr.ttf" embed="true" />
 
 	<!-- _______________________________ Libraries ______________________________ -->
 
@@ -62,6 +65,8 @@
 	<!--In case you want to use the ui package-->
 	<haxelib name="flixel-ui" />
 	<haxelib name="newgrounds" />
+	<haxelib name="faxe" if='switch'/>
+
 	<!-- <haxelib name="markdown" /> -->
 	<!-- <haxelib name="HtmlParser" /> -->
 
@@ -103,10 +108,10 @@
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
-
 	<icon path="art/icon.png" />
-	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
-	<haxedef name="NG_LOGIN" if="newgrounds" />
 
 
+	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
+	<haxedef name="NG_LOGIN" if="newgrounds" />
+
 </project>
diff --git a/README.md b/README.md
@@ -4,3 +4,5 @@ This is the repository for Friday Night Funkin, a game originally made for Ludum
 
 Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin
 Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371
+
+## BrandyBuizel porting this shit like a G to Nintendo Switch 
diff --git a/art/FMOD Logo Black - White Background.png b/art/FMOD Logo Black - White Background.png
diff --git a/art/FMOD Logo White - Black Background.png b/art/FMOD Logo White - Black Background.png
diff --git a/art/Funkin.bmp b/art/Funkin.bmp
diff --git a/art/NintendoSDK_Application.bmp → art/FunkinAlt.bmp b/art/NintendoSDK_Application.bmp → art/FunkinAlt.bmp
diff --git a/art/build-lime-SWITCH.bat b/art/build-lime-SWITCH.bat
@@ -19,7 +19,7 @@ echo HOPE AND PRAY...
 color 0a
 @echo on
 echo BUILDING GAME
-lime build switch -final -v
+lime build switch -final -clean -v
 @echo off
 color 0b
 @echo on

diff --git a/art/iconSwitch.png b/art/iconSwitch.png
diff --git a/art/lucky_guitar_assets.fla b/art/lucky_guitar_assets.fla
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00000.png b/art/lucky_plays_guitar/lucky_plays_guitar_00000.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00001.png b/art/lucky_plays_guitar/lucky_plays_guitar_00001.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00002.png b/art/lucky_plays_guitar/lucky_plays_guitar_00002.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00003.png b/art/lucky_plays_guitar/lucky_plays_guitar_00003.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00004.png b/art/lucky_plays_guitar/lucky_plays_guitar_00004.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00005.png b/art/lucky_plays_guitar/lucky_plays_guitar_00005.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00006.png b/art/lucky_plays_guitar/lucky_plays_guitar_00006.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00007.png b/art/lucky_plays_guitar/lucky_plays_guitar_00007.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00008.png b/art/lucky_plays_guitar/lucky_plays_guitar_00008.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00009.png b/art/lucky_plays_guitar/lucky_plays_guitar_00009.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00010.png b/art/lucky_plays_guitar/lucky_plays_guitar_00010.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00011.png b/art/lucky_plays_guitar/lucky_plays_guitar_00011.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00012.png b/art/lucky_plays_guitar/lucky_plays_guitar_00012.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00013.png b/art/lucky_plays_guitar/lucky_plays_guitar_00013.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00014.png b/art/lucky_plays_guitar/lucky_plays_guitar_00014.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00015.png b/art/lucky_plays_guitar/lucky_plays_guitar_00015.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00016.png b/art/lucky_plays_guitar/lucky_plays_guitar_00016.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00017.png b/art/lucky_plays_guitar/lucky_plays_guitar_00017.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00018.png b/art/lucky_plays_guitar/lucky_plays_guitar_00018.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00019.png b/art/lucky_plays_guitar/lucky_plays_guitar_00019.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00020.png b/art/lucky_plays_guitar/lucky_plays_guitar_00020.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00021.png b/art/lucky_plays_guitar/lucky_plays_guitar_00021.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00022.png b/art/lucky_plays_guitar/lucky_plays_guitar_00022.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00023.png b/art/lucky_plays_guitar/lucky_plays_guitar_00023.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00024.png b/art/lucky_plays_guitar/lucky_plays_guitar_00024.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00025.png b/art/lucky_plays_guitar/lucky_plays_guitar_00025.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00026.png b/art/lucky_plays_guitar/lucky_plays_guitar_00026.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00027.png b/art/lucky_plays_guitar/lucky_plays_guitar_00027.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00028.png b/art/lucky_plays_guitar/lucky_plays_guitar_00028.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00029.png b/art/lucky_plays_guitar/lucky_plays_guitar_00029.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00030.png b/art/lucky_plays_guitar/lucky_plays_guitar_00030.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00031.png b/art/lucky_plays_guitar/lucky_plays_guitar_00031.png
diff --git a/art/lucky_plays_guitar/lucky_plays_guitar_00032.png b/art/lucky_plays_guitar/lucky_plays_guitar_00032.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_10.png b/art/lucky_plays_guitar/lucky_tumble_10.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_11.png b/art/lucky_plays_guitar/lucky_tumble_11.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_13.png b/art/lucky_plays_guitar/lucky_tumble_13.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_14.png b/art/lucky_plays_guitar/lucky_tumble_14.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_15.png b/art/lucky_plays_guitar/lucky_tumble_15.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_16.png b/art/lucky_plays_guitar/lucky_tumble_16.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_17.png b/art/lucky_plays_guitar/lucky_tumble_17.png
diff --git a/art/lucky_plays_guitar/lucky_tumble_18.png b/art/lucky_plays_guitar/lucky_tumble_18.png
diff --git a/art/preloaderArt.png b/art/preloaderArt.png
diff --git a/assets/data/introText.txt b/assets/data/introText.txt
@@ -21,4 +21,5 @@ kiddbrute for president--vote now
 play dead estate--on newgrounds
 this is a god damn prototype--we workin on it okay
 women are real--this is official
-too over exposed--newgrounds cant handle us
+too over exposed--newgrounds cant handle us
+Nintendo Switch--pre-orders now available
diff --git a/assets/data/tutorial/Tutorial.json → assets/data/tutorial/tutorial.json b/assets/data/tutorial/Tutorial.json → assets/data/tutorial/tutorial.json
diff --git a/assets/fonts/fonts-go-here.txt b/assets/fonts/fonts-go-here.txt
diff --git a/assets/images/lucky_guitar_assets.png b/assets/images/lucky_guitar_assets.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ This is the repository for Friday Night Funkin, a game originally made for Ludum

		Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin
		Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371

		## BrandyBuizel porting this shit like a G to Nintendo Switch