cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 01:03:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
Cameron Taylor 2020-11-02 15:37:55 -08:00 committed by GitHub
parent c2f0253f4a bbba49139b
commit 87f67764a3
6 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Project.xml
View file

@ -96,7 +96,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" />
</project>

4
source/Alphabet.hx
View file

@ -48,6 +48,7 @@ class Alphabet extends FlxSpriteGroup
this.text = text;
isBold = bold;
if (text != "")
{
if (typed)
@ -122,6 +123,7 @@ class Alphabet extends FlxSpriteGroup
_finalText = text;
doSplitWords();
// trace(arrayShit);
var loopNum:Int = 0;
@ -138,6 +140,7 @@ class Alphabet extends FlxSpriteGroup
xPosResetted = true;
xPos = 0;
curRow += 1;
}
if (splitWords[loopNum] == " ")
@ -155,6 +158,7 @@ class Alphabet extends FlxSpriteGroup
if (AlphaCharacter.alphabet.indexOf(splitWords[loopNum].toLowerCase()) != -1 || isNumber || isSymbol)
//if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)
{
if (lastSprite != null && !xPosResetted)
{

2
source/ChartingState.hx
View file

@ -758,7 +758,7 @@ class ChartingState extends MusicBeatState
function loadJson(song:String):Void
{
PlayState.SONG = Song.loadFromJson(song);
PlayState.SONG = Song.loadFromJson(song.toLowerCase(), song.toLowerCase());
FlxG.resetState();
}

3
source/PlayState.hx
View file

@ -820,10 +820,12 @@ class PlayState extends MusicBeatState
{
trace('SONG DONE' + isStoryMode);
#if !switch
NGio.postScore(songScore, SONG.song);
#end
if (isStoryMode)
{
storyPlaylist.remove(storyPlaylist[0]);
@ -840,6 +842,7 @@ class PlayState extends MusicBeatState
NGio.unlockMedal(60961);
#end
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush();
}

1
source/Song.hx
View file

@ -49,6 +49,7 @@ class Song
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
{
var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim();
while (!rawJson.endsWith("}"))

9
source/TitleState.hx
View file

@ -40,6 +40,9 @@ class TitleState extends MusicBeatState
var curWacky:Array<String> = [];
var wackyImage:FlxSprite;
override public function create():Void
{
#if (!web)
@ -54,12 +57,16 @@ class TitleState extends MusicBeatState
super.create();
#if (!switch && !debug && NG_LOGIN)
var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey);
#end
#if SKIP_TO_PLAYSTATE
FlxG.switchState(new StoryMenuState());
#else
startIntro();
#end
@ -197,9 +204,11 @@ class TitleState extends MusicBeatState
if (pressedEnter && !transitioning && skippedIntro)
{
#if !switch
NGio.unlockMedal(60960);
#end
titleText.animation.play('press');
FlxG.camera.flash(FlxColor.WHITE, 1);