AirDog46/Kade-Engine
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #13 and closes #10

Browse Source
This commit is contained in:
Cameron Taylor committed 2020-12-02 12:28:28 -05:00
1 parent 87aee63157
commit 3d7e2d2c39
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Project.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file <!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"--> or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
<app preloader="Preloader" resizable="true" /> <!-- <app preloader="Preloader" resizable="true" /> -->
<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2--> <!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
<set name="SWF_VERSION" value="11.8" /> <set name="SWF_VERSION" value="11.8" />
assets/data/monster/monster.json
+1 -1
View File
@@ -1 +1 @@
{"song":{"song":"Monster","notes":[{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[2526.315789473684,0,789.4736842105261],[3473.684210526315,1,0],[3789.4736842105267,3,631.5789473684209],[4736.842105263158,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[5052.631578947368,2,947.3684210526313]],"typeOfSection":0},{"lengthInSteps":16,"bpm":105,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[7578.9473684210525,0,789.4736842105261],[8526.315789473683,1,0],[8842.105263157895,3,631.5789473684209],[9789.473684210527,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[10105.263157894737,2,947.3684210526313]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[13263.157894736842,1,0],[13578.947368421052,0,0],[13894.736842105265,3,315.7894736842105],[14526.315789473685,2,0],[14842.105263157895,0,0],[15000.000000000002,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[15157.894736842105,3,157.89473684210526],[15473.684210526315,1,157.89473684210526],[15789.473684210525,0,157.89473684210526],[16105.263157894735,1,157.89473684210526],[16421.052631578947,2,473.6842105263157],[17052.631578947367,0,473.6842105263157]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[18315.78947368421,1,0],[18631.57894736842,0,0],[18947.368421052633,3,315.7894736842105],[19578.947368421053,2,0],[19894.736842105263,0,0],[20052.63157894737,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[20210.526315789473,3,157.89473684210526],[20526.315789473683,1,157.89473684210526],[20842.105263157893,0,157.89473684210526],[21157.894736842103,1,157.89473684210526],[21473.684210526317,2,473.6842105263157],[22105.263157894737,0,473.6842105263157]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[23368.42105263158,2,157.89473684210526],[23684.210526315786,3,157.89473684210526],[24000,1,473.6842105263157],[24631.57894736842,2,157.89473684210526],[24947.368421052633,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[25263.15789473684,0,473.6842105263157],[25894.73684210526,2,473.6842105263157],[26526.315789473687,3,789.4736842105261]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[28421.052631578947,2,157.89473684210526],[28736.842105263157,3,157.89473684210526],[29052.63157894737,1,473.6842105263157],[29684.21052631579,2,157.89473684210526],[30000,3,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[30315.78947368421,0,473.6842105263157],[30947.36842105263,2,473.6842105263157],[31578.947368421053,3,789.4736842105261]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[32842.10526315789,3,631.5789473684209],[33789.47368421053,2,0],[34105.26315789473,0,0],[34736.84210526315,2,0],[34421.05263157895,3,0],[35052.63157894737,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":false,"sectionNotes":[[37263.15789473684,3,631.5789473684209],[35368.42105263158,2,0],[36000,0,0],[36315.78947368421,3,473.6842105263157],[35684.210526315794,1,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[38210.52631578947,2,157.89473684210526],[38526.31578947368,0,0],[38842.10526315789,3,0],[39157.8947368421,2,0],[39473.68421052631,3,0],[40105.26315789473,1,0],[39789.47368421052,0,0]],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[[40421.05263157895,0,0],[40736.84210526316,3,631.5789473684209]],"typeOfSection":0},{"lengthInSteps":16,"bpm":105,"changeBPM":true,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":105,"changeBPM":true,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":95,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthLine truncated {"notes":[{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":false,"changeBPM":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[7736.84210526316,2,631.578947368421],[8526.31578947368,3,315.789473684211],[9000,2,631.578947368421],[9789.47368421053,3,315.789473684211]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[10263.1578947368,5,1105.26315789474]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[13263.1578947368,6,0],[13578.9473684211,5,0],[14842.1052631579,4,0],[13894.7368421053,7,315.789473684211],[14526.3157894737,5,157.894736842105],[15000,6,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16421.0526315789,2,315.789473684211],[15315.7894736842,3,0],[15631.5789473684,0,0],[15789.4736842105,3,0],[16105.2631578947,1,0],[16894.7368421053,0,315.789473684211]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20052.6315789474,0,0],[19736.8421052632,1,157.894736842105],[18947.3684210526,3,315.789473684211],[18315.7894736842,2,157.894736842105],[18631.5789473684,1,157.894736842105]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20210.5263157895,6,0],[20368.4210526316,7,157.894736842105],[21000,7,0],[20684.2105263158,4,0],[21157.8947368421,5,157.894736842105],[21473.6842105263,6,473.684210526316],[22105.2631578947,4,473.684210526316]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[23368.4210526316,7,157.894736842105],[23684.2105263158,6,157.894736842105],[24000,4,473.684210526316],[24947.3684210526,5,315.789473684211],[24631.5789473684,6,157.894736842105]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[25894.7368421053,2,315.789473684211],[26526.3157894737,3,947.368421052631],[25263.1578947368,0,315.789473684211]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28421.0526315789,3,157.894736842105],[28736.8421052632,2,157.894736842105],[29052.6315789474,0,473.684210526316],[29684.2105263158,2,157.894736842105],[30000,1,157.894736842105]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30947.3684210526,6,315.789473684211],[30315.7894736842,4,315.789473684211],[31578.9473684211,7,1105.26315789474]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33000,2,631.578947368421],[33789.4736842105,0,157.894736842105],[33789.4736842105,2,157.894736842105],[34421.0526315789,1,0],[34105.2631578947,2,157.894736842105],[34736.8421052632,2,157.894736842105],[35052.6315789474,0,157.894736842105],[35052.6315789474,3,157.894736842105]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[37421.0526315789,2,631.578947368421],[35368.4210526316,4,157.894736842105],[35368.4210526316,7,157.894736842105],[35684.2105263158,4,157.894736842105],[36000,6,157.894736842105],[36315.7894736842,7,789.473684210526]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[39000,1,0],[38210.5263157895,0,157.894736842105],[38526.3157894737,2,315.789473684211],[39157.8947368421,2,157.894736842105],[39473.6842105263,3,157.894736842105],[39789.4736842105,0,157.894736842105],[40105.2631578947,2,157.894736842105],[38210.5263157895,2,157.894736842105],[39473.6842105263,0,157.894736842105]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40421.0526315789,4,157.894736842105],[40736.8421052632,7,947.368421052631],[40421.0526315789,7,157.894736842105],[40421.0526315789,4,157.894736842105]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44210.5263157895,3,0],[44526.3157894737,0,0],[44526.3157894737,1,0],[44842.1052631579,1,0],[45157.8947368421,2,0],[45157.8947368421,3,0]],"mustHitSection":false,"changeBPM":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true,"changeBPM":true,"bpm":105},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48947.3684210526,3,0],[49578.9473684211,1,0],[50210.5263157895,3,0],[49105.2631578947,0,157.894736842105],[49105.2631578947,1,157.894736842105],[49894.7368421053,2,157.894736842105],[49894.7368421053,3,157.894736842105]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50526.3157894737,4,0],[51000,4,315.789473684211],[50684.2105263158,6,157.894736842105],[50684.2105263158,7,157.894736842105],[51473.6842105263,5,947.368421052631]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[53526.3157894737,6,157.894736842105],[53842.1052631579,7,157.894736842105],[54157.8947368421,4,157.894736842105],[54473.6842105263,7,157.894736842105],[54789.4736842105,5,157.894736842105],[54789.4736842105,7,157.894736842105],[55105.2631578947,5,0],[55263.1Line truncated
source/PlayState.hx
+5 -5
View File
@@ -740,13 +740,15 @@ class PlayState extends MusicBeatState
// better streaming of shit // better streaming of shit
// RESET = Quick Game Over Screen // RESET = Quick Game Over Screen
if (controls.RESET){ if (controls.RESET)
{
health = 0; health = 0;
trace("RESET = True"); trace("RESET = True");
} }
// CHEAT = brandon's a pussy // CHEAT = brandon's a pussy
if (controls.CHEAT){ if (controls.CHEAT)
{
health += 1; health += 1;
trace("User is cheating!"); trace("User is cheating!");
} }
@@ -828,7 +830,7 @@ class PlayState extends MusicBeatState
if (daNote.y < -daNote.height) if (daNote.y < -daNote.height)
{ {
if (daNote.tooLate) if (daNote.tooLate || !daNote.wasGoodHit)
{ {
health -= 0.04; health -= 0.04;
vocals.volume = 0; vocals.volume = 0;
@@ -851,7 +853,6 @@ class PlayState extends MusicBeatState
{ {
canPause = false; canPause = false;
#if !switch #if !switch
Highscore.saveScore(SONG.song, songScore, storyDifficulty); Highscore.saveScore(SONG.song, songScore, storyDifficulty);
#end #end
@@ -873,7 +874,6 @@ class PlayState extends MusicBeatState
NGio.unlockMedal(60961); NGio.unlockMedal(60961);
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush(); FlxG.save.flush();
} }