From 031fed6f81dbbcae958fb3f20832b69cd23e648a Mon Sep 17 00:00:00 2001 From: Gede Hari Date: Tue, 5 Jan 2021 16:29:32 +0800 Subject: [PATCH 1/6] Move version check screen to TitleState --- source/MainMenuState.hx | 7 ------- source/TitleState.hx | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 1c470084f..e1a1db228 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -89,13 +89,6 @@ class MainMenuState extends MusicBeatState versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(versionShit); - if (versionShit.text.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState) - { - trace('OLD VERSION!'); - - FlxG.switchState(new OutdatedSubState()); - } - // NG.core.calls.event.logEvent('swag').send(); changeItem(); diff --git a/source/TitleState.hx b/source/TitleState.hx index 786d2f2cc..c63d37bd3 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -20,9 +20,13 @@ import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxTimer; +import io.newgrounds.NG; +import lime.app.Application; import lime.utils.Assets; import polymod.Polymod; +using StringTools; + class TitleState extends MusicBeatState { static var initialized:Bool = false; @@ -261,7 +265,19 @@ class TitleState extends MusicBeatState new FlxTimer().start(2, function(tmr:FlxTimer) { - FlxG.switchState(new MainMenuState()); + // Check if version is outdated + + var version:String = "v" + Application.current.meta.get('version'); + + if (version.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState) + { + trace('OLD VERSION!'); + FlxG.switchState(new OutdatedSubState()); + } + else + { + FlxG.switchState(new MainMenuState()); + } }); // FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7); } From c5469bea7ccb4954758229f71c2358dd9904b006 Mon Sep 17 00:00:00 2001 From: Waviest <31796727+WaviestBalloon@users.noreply.github.com> Date: Thu, 7 Jan 2021 00:57:59 +0000 Subject: [PATCH 2/6] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d3052d244..6dd0a86d8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ flixel-ui newgrounds ``` -so for each of those type `haxelib install [library]` so shit like `haxelib install newgrounds` +So for each of those type `haxelib install [library]` so shit like `haxelib install newgrounds` ### Ignored files @@ -60,15 +60,15 @@ Once you have all those installed, it's pretty easy to compile the game. You jus To run it from your desktop (Windows, Mac, Linux) it can be a bit more involved. For Linux, you only need to open a terminal in the project directory and run 'lime test linux -debug' and then run the executible file in export/release/linux/bin. For Windows, you need to install Visual Studio Community 2019. While installing VSC, don't click on any of the options to install workloads. Instead, go to the individual components tab and choose the following: * MSCV v142 - VS 2019 C++ x64/x86 build tools * Windows SDK (10.0.17763.0) -* C++ profiling tools +* C++ Profiling tools * C++ CMake tools for windows * C++ ATL for v142 build tools (x86 & x64) * C++ MFC for v142 build tools (x86 & x64) * C++/CLI support for v142 build tools (14.21) -* C++ Modules for v142 build tools (x64/x86 -) +* C++ Modules for v142 build tools (x64/x86) * Clang Compiler for Windows * Windows 10 SDK (10.0.17134.0) -* Windows 10 SDk (10.0.16299.0) +* Windows 10 SDK (10.0.16299.0) * MSVC v141 - VS 2017 C++ x64/x86 build tools * MSVC v140 - VS 2015 C++ build tools (v14.00) From abf65ef946bd757afc02aa14c79b49f9d537d798 Mon Sep 17 00:00:00 2001 From: Waviest <31796727+WaviestBalloon@users.noreply.github.com> Date: Thu, 7 Jan 2021 01:16:57 +0000 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6dd0a86d8..da4cd3863 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ This game was made with love to Newgrounds and it's community. Extra love to Tom First you need to install Haxe and HaxeFlixel. I'm too lazy to write and keep updated with that setup (which is pretty simple). The link to that is on the [HaxeFlixel website](https://haxeflixel.com/documentation/getting-started/) -That should give you HaxeFlixel and all of it's setup and shit. If you run into issues, ask them in the #flixel channel in the Haxe discord server: https://discord.gg/5ybrNNWx9S +That should give you HaxeFlixel and all of it's setup and shit. If you run into issues, ask them in the #flixel channel in the Haxe Discord server: https://discord.gg/5ybrNNWx9S Other installations you'd need is the additional libraries, a fully updated list will be in `Project.xml` in the project root, but here are the one's I'm using as of writing. From 9f3b4120e397196a21b176c5c8130b7d64b59970 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Fri, 8 Jan 2021 14:01:59 -0600 Subject: [PATCH 4/6] fix pico asset paths --- source/Character.hx | 2 +- source/PlayState.hx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Character.hx b/source/Character.hx index 255fcdc3a..09af0eb9c 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -131,7 +131,7 @@ class Character extends FlxSprite addOffset("singDOWN", -30, -40); playAnim('idle'); case 'pico': - tex = FlxAtlasFrames.fromSparrow('assets/images/.Pico_FNF_assetss.png', 'assets/images/Pico_FNF_assetss.xml'); + tex = FlxAtlasFrames.fromSparrow('assets/images/Pico_FNF_assetss.png', 'assets/images/Pico_FNF_assetss.xml'); frames = tex; animation.addByPrefix('idle', "Pico Idle Dance", 24); animation.addByPrefix('singUP', 'pico Up note0', 24, false); diff --git a/source/PlayState.hx b/source/PlayState.hx index bef9e30db..8f7d2e613 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -163,11 +163,11 @@ class PlayState extends MusicBeatState { curStage = 'philly'; - var bg:FlxSprite = new FlxSprite(-100).loadGraphic('assets/images/sky.png'); + var bg:FlxSprite = new FlxSprite(-100).loadGraphic('assets/images/philly/sky.png'); bg.scrollFactor.set(0.1, 0.1); add(bg); - var city:FlxSprite = new FlxSprite(-10).loadGraphic('assets/images/city.png'); + var city:FlxSprite = new FlxSprite(-10).loadGraphic('assets/images/philly/city.png'); city.scrollFactor.set(0.3, 0.3); city.setGraphicSize(Std.int(city.width * 0.85)); city.updateHitbox(); @@ -186,10 +186,10 @@ class PlayState extends MusicBeatState phillyCityLights.add(light); } - var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic('assets/images/behindTrain.png'); + var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic('assets/images/philly/behindTrain.png'); add(streetBehind); - phillyTrain = new FlxSprite(2000, 360).loadGraphic('assets/images/train.png'); + phillyTrain = new FlxSprite(2000, 360).loadGraphic('assets/images/philly/train.png'); add(phillyTrain); trainSound = new FlxSound().loadEmbedded('assets/sounds/train_passes' + TitleState.soundExt); @@ -197,7 +197,7 @@ class PlayState extends MusicBeatState // var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png); - var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic('assets/images/street.png'); + var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic('assets/images/philly/street.png'); add(street); } else if (SONG.song.toLowerCase() == 'milf' || SONG.song.toLowerCase() == 'satin-panties' || SONG.song.toLowerCase() == 'high') From 1420da25c075d714f1017c2e19f3716fbc603e68 Mon Sep 17 00:00:00 2001 From: Lotusotho <69006987+lotusotho@users.noreply.github.com> Date: Sun, 10 Jan 2021 17:03:46 +0100 Subject: [PATCH 5/6] Delete FlxTransitionableState --- source/PlayState.hx | 1 - 1 file changed, 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 8f7d2e613..10dcad3e1 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -11,7 +11,6 @@ import flixel.FlxSprite; import flixel.FlxState; import flixel.FlxSubState; import flixel.addons.display.FlxGridOverlay; -import flixel.addons.transition.FlxTransitionableState; import flixel.graphics.atlas.FlxAtlas; import flixel.graphics.frames.FlxAtlasFrames; import flixel.group.FlxGroup.FlxTypedGroup; From 2031d5e4ed4dc3b28b9dd2344416f1dd639a71c3 Mon Sep 17 00:00:00 2001 From: Waviest <31796727+WaviestBalloon@users.noreply.github.com> Date: Mon, 11 Jan 2021 16:28:34 +0000 Subject: [PATCH 6/6] Update README.md Co-authored-by: M&M --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da4cd3863..72da2c2ca 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ and you should be good to go there. Once you have all those installed, it's pretty easy to compile the game. You just need to run 'lime test html5 -debug' in the root of the project to build and run the HTML5 version. (command prompt navigation guide can be found here: [https://ninjamuffin99.newgrounds.com/news/post/1090480](https://ninjamuffin99.newgrounds.com/news/post/1090480)) To run it from your desktop (Windows, Mac, Linux) it can be a bit more involved. For Linux, you only need to open a terminal in the project directory and run 'lime test linux -debug' and then run the executible file in export/release/linux/bin. For Windows, you need to install Visual Studio Community 2019. While installing VSC, don't click on any of the options to install workloads. Instead, go to the individual components tab and choose the following: -* MSCV v142 - VS 2019 C++ x64/x86 build tools +* MSVC v142 - VS 2019 C++ x64/x86 build tools * Windows SDK (10.0.17763.0) * C++ Profiling tools * C++ CMake tools for windows