cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-22 13:13:47 +00:00
Code Issues Releases Wiki Activity

merge from PUBLIC

Browse source
This commit is contained in:
MtH 2021-04-08 14:44:13 +02:00
parent 729d48707d 72e2fcada9
commit cdd93d8e48
4 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -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!! 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!!! 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` 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. 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. 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! You should have everything ready for compiling the game! Follow the guide below to continue!

5
source/Discord.hx
View file

@ -32,6 +32,11 @@ class DiscordClient
DiscordRpc.shutdown(); DiscordRpc.shutdown();
} }
public static function shutdown()
{
DiscordRpc.shutdown();
}
static function onReady() static function onReady()
{ {
DiscordRpc.presence({ DiscordRpc.presence({

12
source/PlayState.hx
View file

@ -603,9 +603,6 @@ class PlayState extends MusicBeatState
gfVersion = 'gf-pixel'; gfVersion = 'gf-pixel';
} }
if (curStage == 'limo')
gfVersion = 'gf-car';
if (SONG.song.toLowerCase() == 'stress') if (SONG.song.toLowerCase() == 'stress')
gfVersion = 'pico-speaker'; gfVersion = 'pico-speaker';
@ -2522,11 +2519,12 @@ class PlayState extends MusicBeatState
if (curBeat % 8 == 7 && curSong == 'Bopeebo') if (curBeat % 8 == 7 && curSong == 'Bopeebo')
{ {
boyfriend.playAnim('hey', true); boyfriend.playAnim('hey', true);
}
if (SONG.song == 'Tutorial' && dad.curCharacter == 'gf') if (curBeat % 16 == 15 && SONG.song == 'Tutorial' && dad.curCharacter == 'gf' && curBeat > 16 && curBeat < 48)
{ {
dad.playAnim('cheer', true); boyfriend.playAnim('hey', true);
} dad.playAnim('cheer', true);
} }
foregroundSprites.forEach(function(spr:BGSprite) foregroundSprites.forEach(function(spr:BGSprite)

4
source/TitleState.hx
View file

@ -122,6 +122,10 @@ class TitleState extends MusicBeatState
#if discord_rpc #if discord_rpc
DiscordClient.initialize(); DiscordClient.initialize();
Application.current.onExit.add (function (exitCode) {
DiscordClient.shutdown();
});
#end #end
} }