Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/ninjamuffin99/ld47

Browse source
This commit is contained in:
Cameron Taylor 2021-02-23 23:31:15 -05:00
commit 811cc1f3ae
3 changed files with 108 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
README.md
View file

@ -24,26 +24,28 @@ https://ninja-muffin24.itch.io/friday-night-funkin
IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!! IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!!
### Installing shit ### Installing the Required Programs
First you need to install Haxe and HaxeFlixel. I'm too lazy to write and keep updated with that setup (which is pretty simple). 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/) 1. [Install Haxe 4.1.5](https://haxe.org/download/version/4.1.5/) (Download 4.1.5 instead of 4.2.0 because 4.2.0 is broken and is not working with gits properly...)
2. [Install HaxeFlixel](https://haxeflixel.com/documentation/install-haxeflixel/) after downloading Haxe
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.
Other installations you'd need is the additional libraries, a fully updated list will be in `Project.xml` in the project root. Currently, these are all of the things you need to install:
``` ```
hscript flixel
flixel-addons
flixel-ui flixel-ui
hscript
newgrounds 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. Do this with You'll also need to install polymod. 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.
``` You should have everything ready for compiling the game! Follow the guide below to continue!
haxelib git polymod https://github.com/larsiusprime/polymod.git
```
### Ignored files ### Ignored files

8
source/Note.hx
View file

@ -171,16 +171,14 @@ class Note extends FlxSprite
if (mustPress) if (mustPress)
{ {
// The * 0.5 us so that its easier to hit them too late, instead of too early // The * 0.5 is so that it's easier to hit them too late, instead of too early
if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
&& strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5)) && strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5))
{
canBeHit = true; canBeHit = true;
}
else else
canBeHit = false; canBeHit = false;
if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset) if (strumTime < Conductor.songPosition - Conductor.safeZoneOffset && !wasGoodHit)
tooLate = true; tooLate = true;
} }
else else
@ -188,10 +186,8 @@ class Note extends FlxSprite
canBeHit = false; canBeHit = false;
if (strumTime <= Conductor.songPosition) if (strumTime <= Conductor.songPosition)
{
wasGoodHit = true; wasGoodHit = true;
} }
}
if (tooLate) if (tooLate)
{ {

15
source/PlayState.hx
View file

@ -1562,14 +1562,6 @@ class PlayState extends MusicBeatState
// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed)); // daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
if (daNote.y < -daNote.height) if (daNote.y < -daNote.height)
{
if (daNote.isSustainNote && daNote.wasGoodHit)
{
daNote.kill();
notes.remove(daNote, true);
daNote.destroy();
}
else
{ {
if (daNote.tooLate || !daNote.wasGoodHit) if (daNote.tooLate || !daNote.wasGoodHit)
{ {
@ -1584,7 +1576,6 @@ class PlayState extends MusicBeatState
notes.remove(daNote, true); notes.remove(daNote, true);
daNote.destroy(); daNote.destroy();
} }
}
}); });
} }
@ -1864,7 +1855,7 @@ class PlayState extends MusicBeatState
notes.forEachAlive(function(daNote:Note) notes.forEachAlive(function(daNote:Note)
{ {
if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate) if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate && !daNote.wasGoodHit)
{ {
// the sorting probably doesn't need to be in here? who cares lol // the sorting probably doesn't need to be in here? who cares lol
possibleNotes.push(daNote); possibleNotes.push(daNote);
@ -1940,13 +1931,15 @@ class PlayState extends MusicBeatState
if (upP || rightP || downP || leftP) if (upP || rightP || downP || leftP)
noteCheck(leftP, daNote); noteCheck(leftP, daNote);
} }
*/
//this is already done in noteCheck / goodNoteHit
if (daNote.wasGoodHit) if (daNote.wasGoodHit)
{ {
daNote.kill(); daNote.kill();
notes.remove(daNote, true); notes.remove(daNote, true);
daNote.destroy(); daNote.destroy();
} }
*/
} }
else else
{ {