cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-23 18:39:33 +00:00
Code Issues Releases Wiki Activity

crash on story menu

Browse source
This commit is contained in:
Brandon 2020-11-07 00:05:58 -05:00
parent 85dcbcc429
commit cc8ce9487e
6 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Preloader.hx
View file

@ -29,7 +29,7 @@ class Preloader extends FlxBasePreloader
this._width = Lib.current.stage.stageWidth; this._width = Lib.current.stage.stageWidth;
this._height = Lib.current.stage.stageHeight; this._height = Lib.current.stage.stageHeight;
var ratio:Float = this._width / 800; //This allows us to scale assets depending on the size of the screen. var ratio:Float = this._width / 1920; //This allows us to scale assets depending on the size of the screen.
logo = new Sprite(); 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.addChild(new Bitmap(new LogoImage(0,0))); //Sets the graphic of the sprite to a Bitmap object, which uses our embedded BitmapData class.

7
Project.xml
View file

@ -37,8 +37,8 @@
<classpath name="source" /> <classpath name="source" />
<assets path="assets/images"/> <assets path="assets/images" />
<assets path="assets/data"/> <assets path="assets/data" />
<assets path="assets/music" include="*.mp3" if="web" /> <assets path="assets/music" include="*.mp3" if="web" />
<assets path="assets/music" include="*.ogg" unless="web" /> <assets path="assets/music" include="*.ogg" unless="web" />
@ -59,7 +59,8 @@
<!--In case you want to use the ui package--> <!--In case you want to use the ui package-->
<haxelib name="flixel-ui" /> <haxelib name="flixel-ui" />
<haxelib name="newgrounds" unless="switch" /> <haxelib name="newgrounds" />
<haxelib name="faxe" />
<!-- <haxelib name="markdown" /> --> <!-- <haxelib name="markdown" /> -->
<!-- <haxelib name="HtmlParser" /> --> <!-- <haxelib name="HtmlParser" /> -->

2
README.md
View file

@ -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 Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin
Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371 Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371
## BrandyBuizel porting this shit like a G to Nintendo Switch

BIN
assets/images/preloaderArt.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 434 KiB

2
source/FreeplayState.hx
View file

@ -184,7 +184,9 @@ class FreeplayState extends MusicBeatState
function changeSelection(change:Int = 0) function changeSelection(change:Int = 0)
{ {
#if !switch
NGio.logEvent('Fresh'); NGio.logEvent('Fresh');
#end
curSelected += change; curSelected += change;

8
source/PlayState.hx
View file

@ -30,6 +30,9 @@ import flixel.util.FlxTimer;
import haxe.Json; import haxe.Json;
import lime.utils.Assets; import lime.utils.Assets;
//New Audio BS
//import faxe.Faxe;
using StringTools; using StringTools;
class PlayState extends MusicBeatState class PlayState extends MusicBeatState
@ -841,9 +844,7 @@ class PlayState extends MusicBeatState
function endSong():Void function endSong():Void
{ {
#if !switch
Highscore.saveScore(SONG.song, songScore, storyDifficulty); Highscore.saveScore(SONG.song, songScore, storyDifficulty);
#end
if (isStoryMode) if (isStoryMode)
{ {
@ -861,9 +862,10 @@ class PlayState extends MusicBeatState
#if !switch #if !switch
NGio.unlockMedal(60961); NGio.unlockMedal(60961);
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
#end #end
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush(); FlxG.save.flush();
} }