diff --git a/README.md b/README.md index 8b14b23cd..1c96e4979 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ THESE INSTRUCTIONS ARE FOR COMPILING THE GAME'S SOURCE CODE!!! IF YOU WANT TO JUST DOWNLOAD AND INSTALL AND PLAY THE GAME NORMALLY, GO TO ITCH.IO TO DOWNLOAD THE GAME FOR PC, MAC, AND LINUX!! -https://ninja-muffin24.itch.io/friday-night-funkin +https://ninja-muffin24.itch.io/funkin IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!! @@ -40,10 +40,11 @@ newgrounds ``` So for each of those type `haxelib install [library]` so shit like `haxelib install newgrounds` -You'll also need to install polymod. To do this, you need to do a few things first. +You'll also need to install a couple things that involve Gits. To do this, you need to do a few things first. 1. Download [git-scm](https://git-scm.com/downloads). Works for Windows, Mac, and Linux, just select your build. 2. Follow instructions to install the application properly. -3. Run `haxelib git polymod https://github.com/larsiusprime/polymod.git` in terminal/command-prompt after your git program is installed. +3. Run `haxelib git polymod https://github.com/larsiusprime/polymod.git` to install Polymod. +4. Run `haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc` to install Discord RPC. You should have everything ready for compiling the game! Follow the guide below to continue! diff --git a/source/Discord.hx b/source/Discord.hx index c28e5d9be..04e9ebfa1 100644 --- a/source/Discord.hx +++ b/source/Discord.hx @@ -32,6 +32,11 @@ class DiscordClient DiscordRpc.shutdown(); } + public static function shutdown() + { + DiscordRpc.shutdown(); + } + static function onReady() { DiscordRpc.presence({ diff --git a/source/PlayState.hx b/source/PlayState.hx index 0a6fecd4e..5efc86dc2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -603,9 +603,6 @@ class PlayState extends MusicBeatState gfVersion = 'gf-pixel'; } - if (curStage == 'limo') - gfVersion = 'gf-car'; - if (SONG.song.toLowerCase() == 'stress') gfVersion = 'pico-speaker'; @@ -2522,11 +2519,12 @@ class PlayState extends MusicBeatState if (curBeat % 8 == 7 && curSong == 'Bopeebo') { boyfriend.playAnim('hey', true); + } - if (SONG.song == 'Tutorial' && dad.curCharacter == 'gf') - { - dad.playAnim('cheer', true); - } + if (curBeat % 16 == 15 && SONG.song == 'Tutorial' && dad.curCharacter == 'gf' && curBeat > 16 && curBeat < 48) + { + boyfriend.playAnim('hey', true); + dad.playAnim('cheer', true); } foregroundSprites.forEach(function(spr:BGSprite) diff --git a/source/TitleState.hx b/source/TitleState.hx index 09fdb1ad2..bc1f426cf 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -122,6 +122,10 @@ class TitleState extends MusicBeatState #if discord_rpc DiscordClient.initialize(); + + Application.current.onExit.add (function (exitCode) { + DiscordClient.shutdown(); + }); #end }