From f1d2fad105a77663acee6b33e75c570ba85f8369 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 16 Feb 2021 00:21:11 -0500 Subject: [PATCH] icon bullshit and somethin else gitaroo man --- Project.xml | 1 + source/NGio.hx | 1 + source/PlayState.hx | 18 +++++++++--------- source/TitleState.hx | 6 +++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Project.xml b/Project.xml index a99a8b4..b525b57 100644 --- a/Project.xml +++ b/Project.xml @@ -121,6 +121,7 @@ + diff --git a/source/NGio.hx b/source/NGio.hx index c799c4b..f8d8948 100644 --- a/source/NGio.hx +++ b/source/NGio.hx @@ -49,6 +49,7 @@ class NGio GAME_VER = response.result.data.currentVersion; GAME_VER_NUMS = GAME_VER.split(" ")[0].trim(); trace('CURRENT NG VERSION: ' + GAME_VER); + trace('CURRENT NG VERSION: ' + GAME_VER_NUMS); gotOnlineVer = true; }); diff --git a/source/PlayState.hx b/source/PlayState.hx index 0af1b03..7a2953e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1272,7 +1272,14 @@ class PlayState extends MusicBeatState persistentDraw = true; paused = true; - openSubState(new PauseSubState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); + // 1 / 1000 chance for Gitaroo Man easter egg + if (FlxG.random.bool(0.1)) + { + // gitaroo man easter egg + FlxG.switchState(new GitarooPause()); + } + else + openSubState(new PauseSubState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); } if (FlxG.keys.justPressed.SEVEN) @@ -1470,14 +1477,7 @@ class PlayState extends MusicBeatState vocals.stop(); FlxG.sound.music.stop(); - // 1 / 1000 chance for Gitaroo Man easter egg - if (FlxG.random.bool(0.1)) - { - // gitaroo man easter egg - FlxG.switchState(new GitarooPause()); - } - else - openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); + openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); // FlxG.switchState(new GameOverState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); } diff --git a/source/TitleState.hx b/source/TitleState.hx index 6defd5b..a2ac4af 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -274,9 +274,13 @@ class TitleState extends MusicBeatState var version:String = "v" + Application.current.meta.get('version'); - if (version.trim() != NGio.GAME_VER_NUMS && !OutdatedSubState.leftState) + if (version.trim() != NGio.GAME_VER_NUMS.trim() && !OutdatedSubState.leftState) { trace('OLD VERSION!'); + trace('old ver'); + trace(version.trim()); + trace('cur ver'); + trace(NGio.GAME_VER_NUMS.trim()); FlxG.switchState(new OutdatedSubState()); } else