cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cleansed of NG

This commit is contained in:
Brandon 2020-11-02 15:31:28 -05:00
parent 65de93f679
commit d93ed6c7db
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Alphabet.hx
View File

@ -77,7 +77,8 @@ class Alphabet extends FlxSpriteGroup
lastWasSpace = true; lastWasSpace = true;
} }
if (AlphaCharacter.alphabet.contains(character.toLowerCase())) if (AlphaCharacter.alphabet.indexOf(character.toLowerCase()) != -1)
//if (AlphaCharacter.alphabet.contains(character.toLowerCase()))
{ {
if (lastSprite != null) if (lastSprite != null)
{ {
@ -144,9 +145,16 @@ class Alphabet extends FlxSpriteGroup
lastWasSpace = true; lastWasSpace = true;
} }
#if (haxe >= "4.0.0")
var isNumber:Bool = AlphaCharacter.numbers.contains(splitWords[loopNum]); var isNumber:Bool = AlphaCharacter.numbers.contains(splitWords[loopNum]);
var isSymbol:Bool = AlphaCharacter.symbols.contains(splitWords[loopNum]); var isSymbol:Bool = AlphaCharacter.symbols.contains(splitWords[loopNum]);
if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol) #else
var isNumber:Bool = AlphaCharacter.numbers.indexOf(splitWords[loopNum]) != -1;
var isSymbol:Bool = AlphaCharacter.symbols.indexOf(splitWords[loopNum]) != -1;
#end
if (AlphaCharacter.alphabet.indexOf(splitWords[loopNum].toLowerCase()) != -1 || isNumber || isSymbol)
//if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)
{ {
if (lastSprite != null && !xPosResetted) if (lastSprite != null && !xPosResetted)
{ {

4
source/PlayState.hx
View File

@ -820,7 +820,9 @@ class PlayState extends MusicBeatState
{ {
trace('SONG DONE' + isStoryMode); trace('SONG DONE' + isStoryMode);
#if !switch
NGio.postScore(songScore, SONG.song); NGio.postScore(songScore, SONG.song);
#end
if (isStoryMode) if (isStoryMode)
{ {
@ -834,7 +836,9 @@ class PlayState extends MusicBeatState
StoryMenuState.weekUnlocked[1] = true; StoryMenuState.weekUnlocked[1] = true;
#if !switch
NGio.unlockMedal(60961); NGio.unlockMedal(60961);
#end
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush(); FlxG.save.flush();

9
source/PlayerSettings.hx
View File

@ -14,12 +14,21 @@ class PlayerSettings
static public var player1(default, null):PlayerSettings; static public var player1(default, null):PlayerSettings;
static public var player2(default, null):PlayerSettings; static public var player2(default, null):PlayerSettings;
#if (haxe >= "4.0.0")
static public final onAvatarAdd = new FlxTypedSignal<PlayerSettings->Void>(); static public final onAvatarAdd = new FlxTypedSignal<PlayerSettings->Void>();
static public final onAvatarRemove = new FlxTypedSignal<PlayerSettings->Void>(); static public final onAvatarRemove = new FlxTypedSignal<PlayerSettings->Void>();
#else
static public var onAvatarAdd = new FlxTypedSignal<PlayerSettings->Void>();
static public var onAvatarRemove = new FlxTypedSignal<PlayerSettings->Void>();
#end
public var id(default, null):Int; public var id(default, null):Int;
#if (haxe >= "4.0.0")
public final controls:Controls; public final controls:Controls;
#else
public var controls:Controls;
#end
// public var avatar:Player; // public var avatar:Player;
// public var camera(get, never):PlayCamera; // public var camera(get, never):PlayCamera;

4
source/TitleState.hx
View File

@ -54,7 +54,7 @@ class TitleState extends MusicBeatState
super.create(); super.create();
#if (!debug && NG_LOGIN) #if (!switch && !debug && NG_LOGIN)
var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey);
#end #end
@ -197,7 +197,9 @@ class TitleState extends MusicBeatState
if (pressedEnter && !transitioning && skippedIntro) if (pressedEnter && !transitioning && skippedIntro)
{ {
#if !switch
NGio.unlockMedal(60960); NGio.unlockMedal(60960);
#end
titleText.animation.play('press'); titleText.animation.play('press');
FlxG.camera.flash(FlxColor.WHITE, 1); FlxG.camera.flash(FlxColor.WHITE, 1);