From 931aca84927aa25d033221984eddf9ab47d724a6 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 26 Nov 2020 19:43:45 +0100 Subject: [PATCH 01/15] fixed spamming issue with the buttons on the story menu --- source/StoryMenuState.hx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 1bdfa866e..c87d8e028 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -230,15 +230,23 @@ class StoryMenuState extends MusicBeatState var movedBack:Bool = false; var selectedWeek:Bool = false; - + var stopspamming = false; function selectWeek() { if (weekUnlocked[curWeek]) { - FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt); + if (stopspamming == true) + { + // no more spamming for u hahaha + } + if (stopspamming == false) + { + FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt); - grpWeekText.members[curWeek].week.animation.resume(); - grpWeekCharacters.members[1].animation.play('bfConfirm'); + grpWeekText.members[curWeek].week.animation.resume(); + grpWeekCharacters.members[1].animation.play('bfConfirm'); + stopspamming = true; + } PlayState.storyPlaylist = weekData[curWeek]; PlayState.isStoryMode = true; From f1cf48be10cd3856d41da31da0c33f4940f72bc5 Mon Sep 17 00:00:00 2001 From: lotusotho <69006987+lotusotho@users.noreply.github.com> Date: Thu, 26 Nov 2020 20:14:35 +0100 Subject: [PATCH 02/15] Update StoryMenuState.hx --- source/StoryMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index c87d8e028..173289d67 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -230,7 +230,7 @@ class StoryMenuState extends MusicBeatState var movedBack:Bool = false; var selectedWeek:Bool = false; - var stopspamming = false; + var stopspamming:Bool = false; function selectWeek() { if (weekUnlocked[curWeek]) From 438b3dd2c2254140da52f7a3c2530d22616cb055 Mon Sep 17 00:00:00 2001 From: Lotusotho <69006987+lotusotho@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:53:30 +0100 Subject: [PATCH 03/15] Update StoryMenuState.hx --- source/StoryMenuState.hx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 173289d67..d5338b2af 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -235,10 +235,6 @@ class StoryMenuState extends MusicBeatState { if (weekUnlocked[curWeek]) { - if (stopspamming == true) - { - // no more spamming for u hahaha - } if (stopspamming == false) { FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt); From 527de4b756f1dda67a74fa0b21ae3951352b862f Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 1 Dec 2020 16:51:45 -0800 Subject: [PATCH 04/15] Update CHANGELOG.md --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6e75211..acea000c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [UNRELEASED] +### Fixed +- Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) + ## [0.2.2] - 2020-11-20 ### Added - Music playing on the freeplay menu. @@ -53,4 +57,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.1.0] - 2020-10-05 ### Added -- Uh, everything. This the game's initial gamejam release. We put it out \ No newline at end of file +- Uh, everything. This the game's initial gamejam release. We put it out From f2e08dad77c2a2c682263c9ca8548b5b06876760 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 1 Dec 2020 19:58:02 -0500 Subject: [PATCH 05/15] updated changelog --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index e06994275..0e6d0f4d3 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,4 @@ This is the repository for Friday Night Funkin, a game originally made for Ludum Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371 - -## BrandyBuizel porting this shit like a G to Nintendo Switch \ No newline at end of file +Support the project on the itch.io page: https://itch.io/ninja-muffin24/funkin \ No newline at end of file From c7d0fbd2e9beceedb7e8ce73a74ca01613c52384 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 2 Dec 2020 11:28:26 -0500 Subject: [PATCH 06/15] fixed itch link lol --- Project.xml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.xml b/Project.xml index 4d162fd88..173659ec2 100644 --- a/Project.xml +++ b/Project.xml @@ -64,7 +64,7 @@ - + diff --git a/README.md b/README.md index 0e6d0f4d3..313730e50 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ This is the repository for Friday Night Funkin, a game originally made for Ludum Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371 -Support the project on the itch.io page: https://itch.io/ninja-muffin24/funkin \ No newline at end of file +Support the project on the itch.io page: https://ninja-muffin24.itch.io/funkin \ No newline at end of file From 869ad02b0db28c53f71e0abe670b029c8d4c1d39 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 2 Dec 2020 12:28:28 -0500 Subject: [PATCH 07/15] closes #13 and closes #10 --- Project.xml | 2 +- source/PlayState.hx | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Project.xml b/Project.xml index 173659ec2..78c1b3664 100644 --- a/Project.xml +++ b/Project.xml @@ -9,7 +9,7 @@ - + diff --git a/source/PlayState.hx b/source/PlayState.hx index fb155f35d..05dfa83fd 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -648,7 +648,7 @@ class PlayState extends MusicBeatState } else { - //Conductor.songPosition = FlxG.sound.music.time; + // Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition += FlxG.elapsed * 1000; if (!paused) @@ -679,7 +679,7 @@ class PlayState extends MusicBeatState if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection) { camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100); - //camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); + // camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); vocals.volume = 1; if (SONG.song.toLowerCase() == 'tutorial') @@ -739,14 +739,16 @@ class PlayState extends MusicBeatState } // better streaming of shit - //RESET = Quick Game Over Screen - if (controls.RESET){ + // RESET = Quick Game Over Screen + if (controls.RESET) + { health = 0; trace("RESET = True"); } - //CHEAT = brandon's a pussy - if (controls.CHEAT){ + // CHEAT = brandon's a pussy + if (controls.CHEAT) + { health += 1; trace("User is cheating!"); } @@ -828,7 +830,7 @@ class PlayState extends MusicBeatState if (daNote.y < -daNote.height) { - if (daNote.tooLate) + if (daNote.tooLate || !daNote.wasGoodHit) { health -= 0.04; vocals.volume = 0; @@ -851,7 +853,6 @@ class PlayState extends MusicBeatState { canPause = false; - #if !switch Highscore.saveScore(SONG.song, songScore, storyDifficulty); #end @@ -873,7 +874,6 @@ class PlayState extends MusicBeatState NGio.unlockMedal(60961); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); - FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.flush(); } From 7c5069172f5ceeff4654415ad4b0017fcd4fa412 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 2 Dec 2020 12:31:09 -0500 Subject: [PATCH 08/15] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index acea000c4..d61179649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [UNRELEASED] ### Fixed - Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) +- Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) ## [0.2.2] - 2020-11-20 ### Added From fb4516b8e2723106b4bae2cfcae5b23bb2afb345 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 02:33:34 -0500 Subject: [PATCH 09/15] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d61179649..01ef98d33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) - Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) +- Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/ninjamuffin99/Funkin/pull/24)) ## [0.2.2] - 2020-11-20 ### Added From 2aa92af923a16c5108ca7bfd282966d1c3059550 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:32:35 -0500 Subject: [PATCH 10/15] high score manipulation --- Project.xml | 1 + source/ChartingState.hx | 3 ++- source/PlayState.hx | 9 ++++++--- source/Song.hx | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Project.xml b/Project.xml index 78c1b3664..322b46532 100644 --- a/Project.xml +++ b/Project.xml @@ -10,6 +10,7 @@ + diff --git a/source/ChartingState.hx b/source/ChartingState.hx index f83eae315..1ee5f7869 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -97,7 +97,8 @@ class ChartingState extends MusicBeatState player1: 'bf', player2: 'dad', sectionLengths: [], - speed: 1 + speed: 1, + validScore: false; }; } diff --git a/source/PlayState.hx b/source/PlayState.hx index 05dfa83fd..7bad61d0a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -853,9 +853,12 @@ class PlayState extends MusicBeatState { canPause = false; - #if !switch - Highscore.saveScore(SONG.song, songScore, storyDifficulty); - #end + if (SONG.validScore) + { + #if !switch + Highscore.saveScore(SONG.song, songScore, storyDifficulty); + #end + } if (isStoryMode) { diff --git a/source/Song.hx b/source/Song.hx index 8af708367..772652b94 100644 --- a/source/Song.hx +++ b/source/Song.hx @@ -19,6 +19,7 @@ typedef SwagSong = var player1:String; var player2:String; + var validScore:Bool; } class Song @@ -49,7 +50,6 @@ class Song public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong { - var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim(); while (!rawJson.endsWith("}")) @@ -59,6 +59,7 @@ class Song } var swagShit:SwagSong = cast Json.parse(rawJson).song; + swagShit.validScore = true; trace(swagShit.notes[0]); // FIX THE CASTING ON WINDOWS/NATIVE From 8c55962468de5a93b7bcd10d391a4b829ab36d41 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:36:28 -0500 Subject: [PATCH 11/15] exploit fixin --- CHANGELOG.md | 1 + source/FreeplayState.hx | 7 +------ source/PlayState.hx | 8 ++++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01ef98d33..1333baa75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [UNRELEASED] ### Fixed +- Exploit where you could potentially give yourself a high score via the debug menu - Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) - Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com)) - Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/ninjamuffin99/Funkin/pull/24)) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index ccfdefaf2..795091ffa 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -42,7 +42,7 @@ class FreeplayState extends MusicBeatState isDebug = true; #end - if (StoryMenuState.weekUnlocked[1] || isDebug) + if (StoryMenuState.weekUnlocked[2] || isDebug) { songs.push('Spookeez'); songs.push('South'); @@ -180,12 +180,10 @@ class FreeplayState extends MusicBeatState if (curDifficulty > 2) curDifficulty = 0; - #if !switch intendedScore = Highscore.getScore(songs[curSelected], curDifficulty); #end - switch (curDifficulty) { case 0: @@ -199,7 +197,6 @@ class FreeplayState extends MusicBeatState function changeSelection(change:Int = 0) { - #if !switch NGio.logEvent('Fresh'); #end @@ -216,13 +213,11 @@ class FreeplayState extends MusicBeatState // selector.y = (70 * curSelected) + 30; - #if !switch intendedScore = Highscore.getScore(songs[curSelected], curDifficulty); // lerpScore = 0; #end - FlxG.sound.playMusic('assets/music/' + songs[curSelected] + "_Inst" + TitleState.soundExt, 0); var bullShit:Int = 0; diff --git a/source/PlayState.hx b/source/PlayState.hx index 7bad61d0a..2c5c6da81 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -872,10 +872,14 @@ class PlayState extends MusicBeatState FlxG.switchState(new StoryMenuState()); + // if () StoryMenuState.weekUnlocked[2] = true; - NGio.unlockMedal(60961); - Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); + if (SONG.validScore) + { + NGio.unlockMedal(60961); + Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); + } FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.flush(); From a4d19e41f1f370a83a49d30663b5d1dee037e250 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:38:12 -0500 Subject: [PATCH 12/15] lol fix semi colon --- source/ChartingState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 1ee5f7869..6b1be1346 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -98,7 +98,7 @@ class ChartingState extends MusicBeatState player2: 'dad', sectionLengths: [], speed: 1, - validScore: false; + validScore: false }; } From cec89524ac2606badf35db6d055bc024b0fbf600 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:46:03 -0500 Subject: [PATCH 13/15] more intro texts --- CHANGELOG.md | 2 ++ source/TitleState.hx | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1333baa75..54c75091e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [UNRELEASED] +### Added +- More intro texts ### Fixed - Exploit where you could potentially give yourself a high score via the debug menu - Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19)) diff --git a/source/TitleState.hx b/source/TitleState.hx index e492d0b2a..b286bd91f 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -51,9 +51,9 @@ class TitleState extends MusicBeatState super.create(); - #if (!switch && !debug && NG_LOGIN) - + #if NG_LOGIN var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); + trace('NEWGROUNDS LOL'); #end FlxG.save.bind('funkin', 'ninjamuffin99'); From 7ea8053566ce6eb29d1dfbb9184c2ce1542b22a9 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:46:32 -0500 Subject: [PATCH 14/15] updated version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54c75091e..3d1bc56df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [UNRELEASED] +## [0.2.3] ### Added - More intro texts ### Fixed From 4cbdd39d5bd457db45b0535a1983d157657ada76 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 4 Dec 2020 12:57:09 -0500 Subject: [PATCH 15/15] ng login bullshit --- source/TitleState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/TitleState.hx b/source/TitleState.hx index b286bd91f..ba0012ec6 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -51,7 +51,7 @@ class TitleState extends MusicBeatState super.create(); - #if NG_LOGIN + #if ng var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); trace('NEWGROUNDS LOL'); #end