From f313a3f307ae5a494c5a5af219afe0be22c07e82 Mon Sep 17 00:00:00 2001 From: TheRealJake_12 <84357907+TheRealJake12@users.noreply.github.com> Date: Thu, 28 Dec 2023 14:23:13 -0600 Subject: [PATCH] 1.9.3 bug fixes swap discord lib --- Project.xml | 10 +- README.md | 4 +- assets/preload/data/songs/ugh/ugh-easy.json | 753 +++++++++++++------- assets/preload/data/songs/ugh/ugh-hard.json | 666 ++++++++--------- assets/preload/data/songs/ugh/ugh.json | 666 ++++++++--------- hmm.json | 7 +- source/Discord.hx | 132 ++-- source/FreeplayState.hx | 4 +- source/GameplayCustomizeState.hx | 4 +- source/Main.hx | 5 +- source/MainMenuState.hx | 6 +- source/Modifiers.hx | 3 - source/NoteSplash.hx | 13 +- source/PlayState.hx | 49 +- source/StoryMenuState.hx | 4 +- source/TitleState.hx | 9 +- source/debug/ChartingState.hx | 8 +- version.downloadMe | 6 +- 18 files changed, 1300 insertions(+), 1049 deletions(-) diff --git a/Project.xml b/Project.xml index 1f358def..667ae38d 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + @@ -37,6 +37,12 @@ + + + + + + @@ -148,7 +154,7 @@ - + diff --git a/README.md b/README.md index c875eaf2..b712d963 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ When its finished, you will need to download these like you did with the Librari ```cmd haxelib git linc_luajit https://github.com/superpowers04/linc_luajit haxelib git faxe https://github.com/uhrobots/faxe -haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc +haxelib git hxdiscord_rpc https://github.com/MAJigsaw77/hxdiscord_rpc.git haxelib git hxvlc https://github.com/MAJigsaw77/hxvlc.git ``` @@ -118,7 +118,7 @@ It will take a while to build for both versions. - [PolybiusProxy](https://github.com/polybiusproxy) - The Video Support (Legacy). -- [MAJigsaw77](https://github.com/MAJigsaw77) - The Video Support (Current). +- [MAJigsaw77](https://github.com/MAJigsaw77) - The Video Support (Current), And Discord Support. - [BoloVEVO](https://github.com/BoloVEVO) - Fixed my shit code and improved the chart editor. Made a ton of code improvements. Did the gameplay changers(thanks!!!) diff --git a/assets/preload/data/songs/ugh/ugh-easy.json b/assets/preload/data/songs/ugh/ugh-easy.json index 282ada19..673106f3 100644 --- a/assets/preload/data/songs/ugh/ugh-easy.json +++ b/assets/preload/data/songs/ugh/ugh-easy.json @@ -1,13 +1,12 @@ { "song": { - "splitVoiceTracks": false, + "songName": "ugh", + "songId": "ugh", "player1": "bf", - "songId": "Ugh", - "songName": "Ugh", - "player2": "tankman", + "splitVoiceTracks": false, "notes": [ { - "lengthInSteps": 16, + "endTime": 1500, "sectionNotes": [ [ 0, @@ -38,13 +37,13 @@ 3 ] ], - "endTime": 1500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 0, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 3000, "sectionNotes": [ [ 1500, @@ -75,13 +74,13 @@ 7 ] ], - "endTime": 3000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 1500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 4500, "sectionNotes": [ [ 3000, @@ -112,13 +111,13 @@ 11 ] ], - "endTime": 4500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 3000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 6000, "sectionNotes": [ [ 4500, @@ -149,13 +148,13 @@ 14 ] ], - "endTime": 6000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 4500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 7500, "sectionNotes": [ [ 6000, @@ -186,13 +185,13 @@ 19 ] ], - "endTime": 7500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 6000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 9000, "sectionNotes": [ [ 7500, @@ -223,13 +222,13 @@ 23 ] ], - "endTime": 9000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 7500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 10500, "sectionNotes": [ [ 9000, @@ -260,13 +259,13 @@ 27 ] ], - "endTime": 10500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 9000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 12000, "sectionNotes": [ [ 10500, @@ -304,13 +303,13 @@ 31 ] ], - "endTime": 12000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 10500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 13500, "sectionNotes": [ [ 12000, @@ -348,13 +347,13 @@ 35 ] ], - "endTime": 13500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 12000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 15000, "sectionNotes": [ [ 13500, @@ -385,13 +384,13 @@ 39 ] ], - "endTime": 15000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 13500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 16500, "sectionNotes": [ [ 15000, @@ -429,13 +428,13 @@ 43.5 ] ], - "endTime": 16500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 15000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 18000, "sectionNotes": [ [ 16500, @@ -466,13 +465,13 @@ 47 ] ], - "endTime": 18000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 16500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 19500, "sectionNotes": [ [ 18000, @@ -517,13 +516,13 @@ 51 ] ], - "endTime": 19500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 18000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 21000, "sectionNotes": [ [ 19500, @@ -554,13 +553,13 @@ 55 ] ], - "endTime": 21000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 19500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 22500, "sectionNotes": [ [ 21000, @@ -598,13 +597,13 @@ 59.5 ] ], - "endTime": 22500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 21000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 24000, "sectionNotes": [ [ 22500, @@ -635,13 +634,13 @@ 63 ] ], - "endTime": 24000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 22500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 25500, "sectionNotes": [ [ 24000, @@ -707,13 +706,13 @@ 67.5 ] ], - "endTime": 25500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 24000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 27000, "sectionNotes": [ [ 25500, @@ -758,13 +757,13 @@ 71 ] ], - "endTime": 27000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 25500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 28500, "sectionNotes": [ [ 27000, @@ -851,13 +850,13 @@ 75.5 ] ], - "endTime": 28500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 27000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 30000, "sectionNotes": [ [ 28500, @@ -930,13 +929,13 @@ 79 ] ], - "endTime": 30000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 28500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 31500, "sectionNotes": [ [ 30000, @@ -1002,13 +1001,13 @@ 83.5 ] ], - "endTime": 31500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 30000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 33000, "sectionNotes": [ [ 31500, @@ -1046,13 +1045,13 @@ 87 ] ], - "endTime": 33000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 31500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 34500, "sectionNotes": [ [ 33000, @@ -1139,13 +1138,13 @@ 91.5 ] ], - "endTime": 34500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 33000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 36000, "sectionNotes": [ [ 34500, @@ -1211,13 +1210,13 @@ 95 ] ], - "endTime": 36000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 34500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 37500, "sectionNotes": [ [ 36000, @@ -1255,13 +1254,13 @@ 99 ] ], - "endTime": 37500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 36000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 39000, "sectionNotes": [ [ 37500, @@ -1292,13 +1291,13 @@ 103 ] ], - "endTime": 39000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 37500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 40500, "sectionNotes": [ [ 39000, @@ -1329,13 +1328,13 @@ 107 ] ], - "endTime": 40500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 39000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 42000, "sectionNotes": [ [ 40500, @@ -1366,13 +1365,13 @@ 110 ] ], - "endTime": 42000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 40500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 43500, "sectionNotes": [ [ 42000, @@ -1403,13 +1402,13 @@ 115 ] ], - "endTime": 43500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 42000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 45000, "sectionNotes": [ [ 43500, @@ -1440,13 +1439,13 @@ 119 ] ], - "endTime": 45000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 43500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 46500, "sectionNotes": [ [ 45000, @@ -1477,13 +1476,13 @@ 123 ] ], - "endTime": 46500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 45000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 48000, "sectionNotes": [ [ 46500, @@ -1521,13 +1520,13 @@ 127 ] ], - "endTime": 48000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 46500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 49500, "sectionNotes": [ [ 48000, @@ -1572,13 +1571,13 @@ 130.5 ] ], - "endTime": 49500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 48000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 51000, "sectionNotes": [ [ 49500, @@ -1616,13 +1615,13 @@ 135 ] ], - "endTime": 51000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 49500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 52500, "sectionNotes": [ [ 51000, @@ -1660,13 +1659,13 @@ 139.5 ] ], - "endTime": 52500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 51000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 54000, "sectionNotes": [ [ 52500, @@ -1697,13 +1696,13 @@ 143 ] ], - "endTime": 54000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 52500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 55500, "sectionNotes": [ [ 54000, @@ -1762,13 +1761,13 @@ 147 ] ], - "endTime": 55500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 54000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 57000, "sectionNotes": [ [ 55500, @@ -1806,13 +1805,13 @@ 151 ] ], - "endTime": 57000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 55500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 58500, "sectionNotes": [ [ 57000, @@ -1850,13 +1849,13 @@ 155.5 ] ], - "endTime": 58500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 57000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 60000, "sectionNotes": [ [ 58500, @@ -1887,13 +1886,13 @@ 159 ] ], - "endTime": 60000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 58500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 61500, "sectionNotes": [ [ 60000, @@ -1938,13 +1937,13 @@ 163 ] ], - "endTime": 61500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 60000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 63000, "sectionNotes": [ [ 61500, @@ -1982,13 +1981,13 @@ 167 ] ], - "endTime": 63000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 61500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 64500, "sectionNotes": [ [ 63000, @@ -2026,13 +2025,13 @@ 171.5 ] ], - "endTime": 64500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 63000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 66000, "sectionNotes": [ [ 64500, @@ -2063,13 +2062,13 @@ 175 ] ], - "endTime": 66000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 64500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 67500, "sectionNotes": [ [ 66000, @@ -2114,13 +2113,13 @@ 179 ] ], - "endTime": 67500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 66000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 69000, "sectionNotes": [ [ 67500, @@ -2158,13 +2157,13 @@ 183 ] ], - "endTime": 69000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 67500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 70500, "sectionNotes": [ [ 69000, @@ -2202,13 +2201,13 @@ 187.5 ] ], - "endTime": 70500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 69000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 72000, "sectionNotes": [ [ 70500, @@ -2239,13 +2238,13 @@ 191 ] ], - "endTime": 72000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 70500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 73500, "sectionNotes": [ [ 72000, @@ -2283,13 +2282,13 @@ 195 ] ], - "endTime": 73500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 72000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 75000, "sectionNotes": [ [ 73500, @@ -2320,13 +2319,13 @@ 199 ] ], - "endTime": 75000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 73500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 76500, "sectionNotes": [ [ 75000, @@ -2357,13 +2356,13 @@ 203 ] ], - "endTime": 76500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 75000, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 78000, "sectionNotes": [ [ 76500, @@ -2394,13 +2393,13 @@ 206 ] ], - "endTime": 78000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": false, "startTime": 76500, - "mustHitSection": false + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 79500, "sectionNotes": [ [ 78000, @@ -2431,13 +2430,13 @@ 211 ] ], - "endTime": 79500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 78000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 81000, "sectionNotes": [ [ 79500, @@ -2468,13 +2467,13 @@ 215 ] ], - "endTime": 81000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 79500, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 82500, "sectionNotes": [ [ 81000, @@ -2505,13 +2504,13 @@ 219 ] ], - "endTime": 82500, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 81000, - "mustHitSection": true + "bpm": 160 }, { - "lengthInSteps": 16, + "endTime": 84000, "sectionNotes": [ [ 82500, @@ -2549,52 +2548,143 @@ 223 ] ], - "endTime": 84000, - "bpm": 160, + "lengthInSteps": 16, + "mustHitSection": true, "startTime": 82500, - "mustHitSection": true + "bpm": 160 }, { + "endTime": 85500, + "sectionNotes": [], "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 84000, + "bpm": 160 + }, + { + "endTime": 87000, + "sectionNotes": [], + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 85500, + "bpm": 160 + }, + { + "endTime": 90000, + "playerAltAnim": false, + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, + "typeOfSection": 0, "sectionNotes": [], - "endTime": 85500, "bpm": 160, - "startTime": 84000, - "mustHitSection": true + "startTime": 88500, + "changeBPM": false }, { + "endTime": 93000, + "playerAltAnim": false, + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, "lengthInSteps": 16, + "typeOfSection": 0, "sectionNotes": [], - "endTime": 87000, "bpm": 160, - "startTime": 85500, - "mustHitSection": true + "startTime": 91500, + "changeBPM": false }, { + "endTime": 96000, + "playerAltAnim": false, + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, "lengthInSteps": 16, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 94500, + "changeBPM": false + }, + { + "endTime": 99000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 91500, - "changeBPM": false, - "endTime": 93000, + "startTime": 97500, + "changeBPM": false + }, + { + "endTime": 102000, "playerAltAnim": false, - "mustHitSection": true + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 100500, + "changeBPM": false + }, + { + "endTime": 105000, + "playerAltAnim": false, + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 103500, + "changeBPM": false }, { + "endTime": 108000, + "playerAltAnim": false, + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, "lengthInSteps": 16, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 106500, + "changeBPM": false + }, + { + "endTime": 111000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 97500, - "changeBPM": false, - "endTime": 99000, + "startTime": 109500, + "changeBPM": false + }, + { + "endTime": 114000, "playerAltAnim": false, - "mustHitSection": true + "altAnim": false, + "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 112500, + "changeBPM": false }, { "lengthInSteps": 16, @@ -2603,9 +2693,9 @@ "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 103500, + "startTime": 115500, "changeBPM": false, - "endTime": 105000, + "endTime": 117000, "playerAltAnim": false, "mustHitSection": true }, @@ -2616,9 +2706,9 @@ "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 109500, + "startTime": 118500, "changeBPM": false, - "endTime": 111000, + "endTime": 120000, "playerAltAnim": false, "mustHitSection": true }, @@ -2629,9 +2719,9 @@ "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 115500, + "startTime": 121500, "changeBPM": false, - "endTime": 117000, + "endTime": 123000, "playerAltAnim": false, "mustHitSection": true }, @@ -2642,9 +2732,9 @@ "typeOfSection": 0, "sectionNotes": [], "bpm": 160, - "startTime": 121500, + "startTime": 124500, "changeBPM": false, - "endTime": 123000, + "endTime": 126000, "playerAltAnim": false, "mustHitSection": true }, @@ -2661,6 +2751,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 130500, + "changeBPM": false, + "endTime": 132000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2674,6 +2777,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 136500, + "changeBPM": false, + "endTime": 138000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2687,6 +2803,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 142500, + "changeBPM": false, + "endTime": 144000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2700,6 +2829,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 148500, + "changeBPM": false, + "endTime": 150000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2713,6 +2855,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 154500, + "changeBPM": false, + "endTime": 156000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2726,6 +2881,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 160500, + "changeBPM": false, + "endTime": 162000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2739,6 +2907,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 166500, + "changeBPM": false, + "endTime": 168000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2752,6 +2933,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 172500, + "changeBPM": false, + "endTime": 174000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2765,6 +2959,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 178500, + "changeBPM": false, + "endTime": 180000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2778,6 +2985,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 184500, + "changeBPM": false, + "endTime": 186000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2791,6 +3011,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 190500, + "changeBPM": false, + "endTime": 192000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2804,6 +3037,19 @@ "playerAltAnim": false, "mustHitSection": true }, + { + "lengthInSteps": 16, + "altAnim": false, + "CPUAltAnim": false, + "typeOfSection": 0, + "sectionNotes": [], + "bpm": 160, + "startTime": 196500, + "changeBPM": false, + "endTime": 198000, + "playerAltAnim": false, + "mustHitSection": true + }, { "lengthInSteps": 16, "altAnim": false, @@ -2818,7 +3064,8 @@ "mustHitSection": true } ], - "audioFile": "ugh", + "player2": "tankman", + "audioFile": "gh", "offset": 0, "song": "Ugh", "validScore": true, @@ -2864,7 +3111,7 @@ ], "stage": "tank", "needsVoices": true, - "noteStyle": "normal", - "bpm": 160 + "bpm": 160, + "noteStyle": "normal" } } \ No newline at end of file diff --git a/assets/preload/data/songs/ugh/ugh-hard.json b/assets/preload/data/songs/ugh/ugh-hard.json index 059b8fe4..df3ade27 100644 --- a/assets/preload/data/songs/ugh/ugh-hard.json +++ b/assets/preload/data/songs/ugh/ugh-hard.json @@ -1,13 +1,12 @@ { "song": { - "splitVoiceTracks": false, + "songName": "ugh", + "songId": "ugh", "player1": "bf", - "songId": "Ugh", - "songName": "Ugh", - "player2": "tankman", + "splitVoiceTracks": false, "notes": [ { - "lengthInSteps": 16, + "endTime": 1500, "sectionNotes": [ [ 0, @@ -73,12 +72,12 @@ 3.75 ] ], - "endTime": 1500, - "startTime": 0, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 0 }, { - "lengthInSteps": 16, + "endTime": 3000, "sectionNotes": [ [ 1500, @@ -144,12 +143,12 @@ 7 ] ], - "endTime": 3000, - "startTime": 1500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 1500 }, { - "lengthInSteps": 16, + "endTime": 4500, "sectionNotes": [ [ 3000, @@ -201,12 +200,12 @@ 11 ] ], - "endTime": 4500, - "startTime": 3000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 3000 }, { - "lengthInSteps": 16, + "endTime": 6000, "sectionNotes": [ [ 4500, @@ -244,12 +243,12 @@ 14 ] ], - "endTime": 6000, - "startTime": 4500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 4500 }, { - "lengthInSteps": 16, + "endTime": 7500, "sectionNotes": [ [ 6000, @@ -315,12 +314,12 @@ 19.75 ] ], - "endTime": 7500, - "startTime": 6000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 6000 }, { - "lengthInSteps": 16, + "endTime": 9000, "sectionNotes": [ [ 7500, @@ -386,12 +385,12 @@ 23 ] ], - "endTime": 9000, - "startTime": 7500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 7500 }, { - "lengthInSteps": 16, + "endTime": 10500, "sectionNotes": [ [ 9000, @@ -443,12 +442,12 @@ 27 ] ], - "endTime": 10500, - "startTime": 9000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 9000 }, { - "lengthInSteps": 16, + "endTime": 12000, "sectionNotes": [ [ 10500, @@ -493,12 +492,12 @@ 31 ] ], - "endTime": 12000, - "startTime": 10500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 10500 }, { - "lengthInSteps": 16, + "endTime": 13500, "sectionNotes": [ [ 12000, @@ -578,12 +577,12 @@ 35.5 ] ], - "endTime": 13500, - "startTime": 12000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 12000 }, { - "lengthInSteps": 16, + "endTime": 15000, "sectionNotes": [ [ 13500, @@ -642,12 +641,12 @@ 39.5 ] ], - "endTime": 15000, - "startTime": 13500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 13500 }, { - "lengthInSteps": 16, + "endTime": 16500, "sectionNotes": [ [ 15000, @@ -727,12 +726,12 @@ 43.5 ] ], - "endTime": 16500, - "startTime": 15000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 15000 }, { - "lengthInSteps": 16, + "endTime": 18000, "sectionNotes": [ [ 16500, @@ -798,12 +797,12 @@ 47.5 ] ], - "endTime": 18000, - "startTime": 16500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 16500 }, { - "lengthInSteps": 16, + "endTime": 19500, "sectionNotes": [ [ 18000, @@ -890,12 +889,12 @@ 51.5 ] ], - "endTime": 19500, - "startTime": 18000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 18000 }, { - "lengthInSteps": 16, + "endTime": 21000, "sectionNotes": [ [ 19500, @@ -954,12 +953,12 @@ 55.5 ] ], - "endTime": 21000, - "startTime": 19500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 19500 }, { - "lengthInSteps": 16, + "endTime": 22500, "sectionNotes": [ [ 21000, @@ -1039,12 +1038,12 @@ 59.5 ] ], - "endTime": 22500, - "startTime": 21000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 21000 }, { - "lengthInSteps": 16, + "endTime": 24000, "sectionNotes": [ [ 22500, @@ -1110,12 +1109,12 @@ 63.5 ] ], - "endTime": 24000, - "startTime": 22500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 22500 }, { - "lengthInSteps": 16, + "endTime": 25500, "sectionNotes": [ [ 24000, @@ -1223,12 +1222,12 @@ 67.75 ] ], - "endTime": 25500, - "startTime": 24000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 24000 }, { - "lengthInSteps": 16, + "endTime": 27000, "sectionNotes": [ [ 25500, @@ -1294,12 +1293,12 @@ 71.5 ] ], - "endTime": 27000, - "startTime": 25500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 25500 }, { - "lengthInSteps": 16, + "endTime": 28500, "sectionNotes": [ [ 27000, @@ -1428,12 +1427,12 @@ 75.75 ] ], - "endTime": 28500, - "startTime": 27000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 27000 }, { - "lengthInSteps": 16, + "endTime": 30000, "sectionNotes": [ [ 28500, @@ -1527,12 +1526,12 @@ 79.5 ] ], - "endTime": 30000, - "startTime": 28500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 28500 }, { - "lengthInSteps": 16, + "endTime": 31500, "sectionNotes": [ [ 30000, @@ -1619,12 +1618,12 @@ 83.75 ] ], - "endTime": 31500, - "startTime": 30000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 30000 }, { - "lengthInSteps": 16, + "endTime": 33000, "sectionNotes": [ [ 31500, @@ -1676,12 +1675,12 @@ 87 ] ], - "endTime": 33000, - "startTime": 31500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 31500 }, { - "lengthInSteps": 16, + "endTime": 34500, "sectionNotes": [ [ 33000, @@ -1789,12 +1788,12 @@ 91.75 ] ], - "endTime": 34500, - "startTime": 33000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 33000 }, { - "lengthInSteps": 16, + "endTime": 36000, "sectionNotes": [ [ 34500, @@ -1874,12 +1873,12 @@ 95 ] ], - "endTime": 36000, - "startTime": 34500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 34500 }, { - "lengthInSteps": 16, + "endTime": 37500, "sectionNotes": [ [ 36000, @@ -1952,12 +1951,12 @@ 99.75 ] ], - "endTime": 37500, - "startTime": 36000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 36000 }, { - "lengthInSteps": 16, + "endTime": 39000, "sectionNotes": [ [ 37500, @@ -2023,12 +2022,12 @@ 103 ] ], - "endTime": 39000, - "startTime": 37500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 37500 }, { - "lengthInSteps": 16, + "endTime": 40500, "sectionNotes": [ [ 39000, @@ -2080,12 +2079,12 @@ 107 ] ], - "endTime": 40500, - "startTime": 39000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 39000 }, { - "lengthInSteps": 16, + "endTime": 42000, "sectionNotes": [ [ 40500, @@ -2123,12 +2122,12 @@ 110 ] ], - "endTime": 42000, - "startTime": 40500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 40500 }, { - "lengthInSteps": 16, + "endTime": 43500, "sectionNotes": [ [ 42000, @@ -2194,12 +2193,12 @@ 115.75 ] ], - "endTime": 43500, - "startTime": 42000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 42000 }, { - "lengthInSteps": 16, + "endTime": 45000, "sectionNotes": [ [ 43500, @@ -2265,12 +2264,12 @@ 119 ] ], - "endTime": 45000, - "startTime": 43500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 43500 }, { - "lengthInSteps": 16, + "endTime": 46500, "sectionNotes": [ [ 45000, @@ -2322,12 +2321,12 @@ 123 ] ], - "endTime": 46500, - "startTime": 45000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 45000 }, { - "lengthInSteps": 16, + "endTime": 48000, "sectionNotes": [ [ 46500, @@ -2372,12 +2371,12 @@ 127 ] ], - "endTime": 48000, - "startTime": 46500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 46500 }, { - "lengthInSteps": 16, + "endTime": 49500, "sectionNotes": [ [ 48000, @@ -2450,12 +2449,12 @@ 130.5 ] ], - "endTime": 49500, - "startTime": 48000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 48000 }, { - "lengthInSteps": 16, + "endTime": 51000, "sectionNotes": [ [ 49500, @@ -2514,12 +2513,12 @@ 135.5 ] ], - "endTime": 51000, - "startTime": 49500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 49500 }, { - "lengthInSteps": 16, + "endTime": 52500, "sectionNotes": [ [ 51000, @@ -2599,12 +2598,12 @@ 139.5 ] ], - "endTime": 52500, - "startTime": 51000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 51000 }, { - "lengthInSteps": 16, + "endTime": 54000, "sectionNotes": [ [ 52500, @@ -2670,12 +2669,12 @@ 143.5 ] ], - "endTime": 54000, - "startTime": 52500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 52500 }, { - "lengthInSteps": 16, + "endTime": 55500, "sectionNotes": [ [ 54000, @@ -2762,12 +2761,12 @@ 147 ] ], - "endTime": 55500, - "startTime": 54000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 54000 }, { - "lengthInSteps": 16, + "endTime": 57000, "sectionNotes": [ [ 55500, @@ -2826,12 +2825,12 @@ 151.5 ] ], - "endTime": 57000, - "startTime": 55500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 55500 }, { - "lengthInSteps": 16, + "endTime": 58500, "sectionNotes": [ [ 57000, @@ -2911,12 +2910,12 @@ 155.5 ] ], - "endTime": 58500, - "startTime": 57000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 57000 }, { - "lengthInSteps": 16, + "endTime": 60000, "sectionNotes": [ [ 58500, @@ -2982,12 +2981,12 @@ 159.5 ] ], - "endTime": 60000, - "startTime": 58500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 58500 }, { - "lengthInSteps": 16, + "endTime": 61500, "sectionNotes": [ [ 60000, @@ -3074,12 +3073,12 @@ 163.5 ] ], - "endTime": 61500, - "startTime": 60000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 60000 }, { - "lengthInSteps": 16, + "endTime": 63000, "sectionNotes": [ [ 61500, @@ -3138,12 +3137,12 @@ 167.5 ] ], - "endTime": 63000, - "startTime": 61500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 61500 }, { - "lengthInSteps": 16, + "endTime": 64500, "sectionNotes": [ [ 63000, @@ -3223,12 +3222,12 @@ 171.5 ] ], - "endTime": 64500, - "startTime": 63000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 63000 }, { - "lengthInSteps": 16, + "endTime": 66000, "sectionNotes": [ [ 64500, @@ -3294,12 +3293,12 @@ 175.5 ] ], - "endTime": 66000, - "startTime": 64500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 64500 }, { - "lengthInSteps": 16, + "endTime": 67500, "sectionNotes": [ [ 66000, @@ -3386,12 +3385,12 @@ 179.5 ] ], - "endTime": 67500, - "startTime": 66000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 66000 }, { - "lengthInSteps": 16, + "endTime": 69000, "sectionNotes": [ [ 67500, @@ -3450,12 +3449,12 @@ 183.5 ] ], - "endTime": 69000, - "startTime": 67500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 67500 }, { - "lengthInSteps": 16, + "endTime": 70500, "sectionNotes": [ [ 69000, @@ -3535,12 +3534,12 @@ 187.5 ] ], - "endTime": 70500, - "startTime": 69000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 69000 }, { - "lengthInSteps": 16, + "endTime": 72000, "sectionNotes": [ [ 70500, @@ -3606,12 +3605,12 @@ 191.5 ] ], - "endTime": 72000, - "startTime": 70500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 70500 }, { - "lengthInSteps": 16, + "endTime": 73500, "sectionNotes": [ [ 72000, @@ -3684,12 +3683,12 @@ 195.75 ] ], - "endTime": 73500, - "startTime": 72000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 72000 }, { - "lengthInSteps": 16, + "endTime": 75000, "sectionNotes": [ [ 73500, @@ -3755,12 +3754,12 @@ 199 ] ], - "endTime": 75000, - "startTime": 73500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 73500 }, { - "lengthInSteps": 16, + "endTime": 76500, "sectionNotes": [ [ 75000, @@ -3812,12 +3811,12 @@ 203 ] ], - "endTime": 76500, - "startTime": 75000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 75000 }, { - "lengthInSteps": 16, + "endTime": 78000, "sectionNotes": [ [ 76500, @@ -3855,12 +3854,12 @@ 206 ] ], - "endTime": 78000, - "startTime": 76500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 76500 }, { - "lengthInSteps": 16, + "endTime": 79500, "sectionNotes": [ [ 78000, @@ -3926,12 +3925,12 @@ 211.75 ] ], - "endTime": 79500, - "startTime": 78000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 78000 }, { - "lengthInSteps": 16, + "endTime": 81000, "sectionNotes": [ [ 79500, @@ -3997,12 +3996,12 @@ 215 ] ], - "endTime": 81000, - "startTime": 79500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 79500 }, { - "lengthInSteps": 16, + "endTime": 82500, "sectionNotes": [ [ 81000, @@ -4054,12 +4053,12 @@ 219 ] ], - "endTime": 82500, - "startTime": 81000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 81000 }, { - "lengthInSteps": 16, + "endTime": 84000, "sectionNotes": [ [ 82500, @@ -4104,270 +4103,270 @@ 223 ] ], - "endTime": 84000, - "startTime": 82500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 82500 }, { - "lengthInSteps": 16, - "sectionNotes": [], "endTime": 85500, - "startTime": 84000, - "mustHitSection": true + "sectionNotes": [], + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 84000 }, { - "lengthInSteps": 16, - "sectionNotes": [], "endTime": 87000, - "startTime": 85500, - "mustHitSection": true + "sectionNotes": [], + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 85500 }, { - "lengthInSteps": 16, + "endTime": 90000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 88500, - "changeBPM": false, - "endTime": 90000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 93000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 91500, - "changeBPM": false, - "endTime": 93000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 96000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 94500, - "changeBPM": false, - "endTime": 96000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 99000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 97500, - "changeBPM": false, - "endTime": 99000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 102000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 100500, - "changeBPM": false, - "endTime": 102000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 105000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 103500, - "changeBPM": false, - "endTime": 105000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 108000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 106500, - "changeBPM": false, - "endTime": 108000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 111000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 109500, - "changeBPM": false, - "endTime": 111000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 114000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 112500, - "changeBPM": false, - "endTime": 114000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 117000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 115500, - "changeBPM": false, - "endTime": 117000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 120000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 118500, - "changeBPM": false, - "endTime": 120000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 123000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 121500, - "changeBPM": false, - "endTime": 123000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 126000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 124500, - "changeBPM": false, - "endTime": 126000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 129000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 127500, - "changeBPM": false, - "endTime": 129000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 132000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 130500, - "changeBPM": false, - "endTime": 132000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 135000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 133500, - "changeBPM": false, - "endTime": 135000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 138000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 136500, - "changeBPM": false, - "endTime": 138000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 141000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 139500, - "changeBPM": false, - "endTime": 141000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 144000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 142500, - "changeBPM": false, - "endTime": 144000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { "lengthInSteps": 16, @@ -4617,6 +4616,7 @@ "mustHitSection": true } ], + "player2": "tankman", "audioFile": "ugh", "offset": 0, "song": "Ugh", @@ -4663,7 +4663,7 @@ ], "stage": "tank", "needsVoices": true, - "noteStyle": "normal", - "bpm": 160 + "bpm": 160, + "noteStyle": "normal" } } \ No newline at end of file diff --git a/assets/preload/data/songs/ugh/ugh.json b/assets/preload/data/songs/ugh/ugh.json index 491006f5..83917051 100644 --- a/assets/preload/data/songs/ugh/ugh.json +++ b/assets/preload/data/songs/ugh/ugh.json @@ -1,13 +1,12 @@ { "song": { - "splitVoiceTracks": false, + "songName": "ugh", + "songId": "ugh", "player1": "bf", - "songId": "Ugh", - "songName": "Ugh", - "player2": "tankman", + "splitVoiceTracks": false, "notes": [ { - "lengthInSteps": 16, + "endTime": 1500, "sectionNotes": [ [ 0, @@ -59,12 +58,12 @@ 3 ] ], - "endTime": 1500, - "startTime": 0, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 0 }, { - "lengthInSteps": 16, + "endTime": 3000, "sectionNotes": [ [ 1500, @@ -116,12 +115,12 @@ 7 ] ], - "endTime": 3000, - "startTime": 1500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 1500 }, { - "lengthInSteps": 16, + "endTime": 4500, "sectionNotes": [ [ 3000, @@ -173,12 +172,12 @@ 11 ] ], - "endTime": 4500, - "startTime": 3000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 3000 }, { - "lengthInSteps": 16, + "endTime": 6000, "sectionNotes": [ [ 4500, @@ -216,12 +215,12 @@ 14 ] ], - "endTime": 6000, - "startTime": 4500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 4500 }, { - "lengthInSteps": 16, + "endTime": 7500, "sectionNotes": [ [ 6000, @@ -273,12 +272,12 @@ 19 ] ], - "endTime": 7500, - "startTime": 6000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 6000 }, { - "lengthInSteps": 16, + "endTime": 9000, "sectionNotes": [ [ 7500, @@ -330,12 +329,12 @@ 23 ] ], - "endTime": 9000, - "startTime": 7500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 7500 }, { - "lengthInSteps": 16, + "endTime": 10500, "sectionNotes": [ [ 9000, @@ -387,12 +386,12 @@ 27 ] ], - "endTime": 10500, - "startTime": 9000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 9000 }, { - "lengthInSteps": 16, + "endTime": 12000, "sectionNotes": [ [ 10500, @@ -437,12 +436,12 @@ 31 ] ], - "endTime": 12000, - "startTime": 10500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 10500 }, { - "lengthInSteps": 16, + "endTime": 13500, "sectionNotes": [ [ 12000, @@ -515,12 +514,12 @@ 35.5 ] ], - "endTime": 13500, - "startTime": 12000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 12000 }, { - "lengthInSteps": 16, + "endTime": 15000, "sectionNotes": [ [ 13500, @@ -579,12 +578,12 @@ 39.5 ] ], - "endTime": 15000, - "startTime": 13500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 13500 }, { - "lengthInSteps": 16, + "endTime": 16500, "sectionNotes": [ [ 15000, @@ -643,12 +642,12 @@ 43.5 ] ], - "endTime": 16500, - "startTime": 15000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 15000 }, { - "lengthInSteps": 16, + "endTime": 18000, "sectionNotes": [ [ 16500, @@ -714,12 +713,12 @@ 47.5 ] ], - "endTime": 18000, - "startTime": 16500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 16500 }, { - "lengthInSteps": 16, + "endTime": 19500, "sectionNotes": [ [ 18000, @@ -799,12 +798,12 @@ 51.5 ] ], - "endTime": 19500, - "startTime": 18000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 18000 }, { - "lengthInSteps": 16, + "endTime": 21000, "sectionNotes": [ [ 19500, @@ -863,12 +862,12 @@ 55.5 ] ], - "endTime": 21000, - "startTime": 19500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 19500 }, { - "lengthInSteps": 16, + "endTime": 22500, "sectionNotes": [ [ 21000, @@ -927,12 +926,12 @@ 59.5 ] ], - "endTime": 22500, - "startTime": 21000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 21000 }, { - "lengthInSteps": 16, + "endTime": 24000, "sectionNotes": [ [ 22500, @@ -998,12 +997,12 @@ 63.5 ] ], - "endTime": 24000, - "startTime": 22500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 22500 }, { - "lengthInSteps": 16, + "endTime": 25500, "sectionNotes": [ [ 24000, @@ -1090,12 +1089,12 @@ 67.75 ] ], - "endTime": 25500, - "startTime": 24000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 24000 }, { - "lengthInSteps": 16, + "endTime": 27000, "sectionNotes": [ [ 25500, @@ -1154,12 +1153,12 @@ 71.5 ] ], - "endTime": 27000, - "startTime": 25500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 25500 }, { - "lengthInSteps": 16, + "endTime": 28500, "sectionNotes": [ [ 27000, @@ -1267,12 +1266,12 @@ 75.75 ] ], - "endTime": 28500, - "startTime": 27000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 27000 }, { - "lengthInSteps": 16, + "endTime": 30000, "sectionNotes": [ [ 28500, @@ -1359,12 +1358,12 @@ 79.5 ] ], - "endTime": 30000, - "startTime": 28500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 28500 }, { - "lengthInSteps": 16, + "endTime": 31500, "sectionNotes": [ [ 30000, @@ -1451,12 +1450,12 @@ 83.75 ] ], - "endTime": 31500, - "startTime": 30000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 30000 }, { - "lengthInSteps": 16, + "endTime": 33000, "sectionNotes": [ [ 31500, @@ -1508,12 +1507,12 @@ 87 ] ], - "endTime": 33000, - "startTime": 31500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 31500 }, { - "lengthInSteps": 16, + "endTime": 34500, "sectionNotes": [ [ 33000, @@ -1621,12 +1620,12 @@ 91.75 ] ], - "endTime": 34500, - "startTime": 33000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 33000 }, { - "lengthInSteps": 16, + "endTime": 36000, "sectionNotes": [ [ 34500, @@ -1706,12 +1705,12 @@ 95 ] ], - "endTime": 36000, - "startTime": 34500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 34500 }, { - "lengthInSteps": 16, + "endTime": 37500, "sectionNotes": [ [ 36000, @@ -1770,12 +1769,12 @@ 99 ] ], - "endTime": 37500, - "startTime": 36000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 36000 }, { - "lengthInSteps": 16, + "endTime": 39000, "sectionNotes": [ [ 37500, @@ -1827,12 +1826,12 @@ 103 ] ], - "endTime": 39000, - "startTime": 37500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 37500 }, { - "lengthInSteps": 16, + "endTime": 40500, "sectionNotes": [ [ 39000, @@ -1884,12 +1883,12 @@ 107 ] ], - "endTime": 40500, - "startTime": 39000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 39000 }, { - "lengthInSteps": 16, + "endTime": 42000, "sectionNotes": [ [ 40500, @@ -1927,12 +1926,12 @@ 110 ] ], - "endTime": 42000, - "startTime": 40500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 40500 }, { - "lengthInSteps": 16, + "endTime": 43500, "sectionNotes": [ [ 42000, @@ -1984,12 +1983,12 @@ 115 ] ], - "endTime": 43500, - "startTime": 42000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 42000 }, { - "lengthInSteps": 16, + "endTime": 45000, "sectionNotes": [ [ 43500, @@ -2041,12 +2040,12 @@ 119 ] ], - "endTime": 45000, - "startTime": 43500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 43500 }, { - "lengthInSteps": 16, + "endTime": 46500, "sectionNotes": [ [ 45000, @@ -2098,12 +2097,12 @@ 123 ] ], - "endTime": 46500, - "startTime": 45000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 45000 }, { - "lengthInSteps": 16, + "endTime": 48000, "sectionNotes": [ [ 46500, @@ -2148,12 +2147,12 @@ 127 ] ], - "endTime": 48000, - "startTime": 46500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 46500 }, { - "lengthInSteps": 16, + "endTime": 49500, "sectionNotes": [ [ 48000, @@ -2212,12 +2211,12 @@ 130.5 ] ], - "endTime": 49500, - "startTime": 48000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 48000 }, { - "lengthInSteps": 16, + "endTime": 51000, "sectionNotes": [ [ 49500, @@ -2276,12 +2275,12 @@ 135.5 ] ], - "endTime": 51000, - "startTime": 49500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 49500 }, { - "lengthInSteps": 16, + "endTime": 52500, "sectionNotes": [ [ 51000, @@ -2340,12 +2339,12 @@ 139.5 ] ], - "endTime": 52500, - "startTime": 51000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 51000 }, { - "lengthInSteps": 16, + "endTime": 54000, "sectionNotes": [ [ 52500, @@ -2411,12 +2410,12 @@ 143.5 ] ], - "endTime": 54000, - "startTime": 52500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 52500 }, { - "lengthInSteps": 16, + "endTime": 55500, "sectionNotes": [ [ 54000, @@ -2489,12 +2488,12 @@ 147 ] ], - "endTime": 55500, - "startTime": 54000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 54000 }, { - "lengthInSteps": 16, + "endTime": 57000, "sectionNotes": [ [ 55500, @@ -2553,12 +2552,12 @@ 151.5 ] ], - "endTime": 57000, - "startTime": 55500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 55500 }, { - "lengthInSteps": 16, + "endTime": 58500, "sectionNotes": [ [ 57000, @@ -2617,12 +2616,12 @@ 155.5 ] ], - "endTime": 58500, - "startTime": 57000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 57000 }, { - "lengthInSteps": 16, + "endTime": 60000, "sectionNotes": [ [ 58500, @@ -2688,12 +2687,12 @@ 159.5 ] ], - "endTime": 60000, - "startTime": 58500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 58500 }, { - "lengthInSteps": 16, + "endTime": 61500, "sectionNotes": [ [ 60000, @@ -2773,12 +2772,12 @@ 163.5 ] ], - "endTime": 61500, - "startTime": 60000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 60000 }, { - "lengthInSteps": 16, + "endTime": 63000, "sectionNotes": [ [ 61500, @@ -2837,12 +2836,12 @@ 167.5 ] ], - "endTime": 63000, - "startTime": 61500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 61500 }, { - "lengthInSteps": 16, + "endTime": 64500, "sectionNotes": [ [ 63000, @@ -2901,12 +2900,12 @@ 171.5 ] ], - "endTime": 64500, - "startTime": 63000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 63000 }, { - "lengthInSteps": 16, + "endTime": 66000, "sectionNotes": [ [ 64500, @@ -2972,12 +2971,12 @@ 175.5 ] ], - "endTime": 66000, - "startTime": 64500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 64500 }, { - "lengthInSteps": 16, + "endTime": 67500, "sectionNotes": [ [ 66000, @@ -3057,12 +3056,12 @@ 179.5 ] ], - "endTime": 67500, - "startTime": 66000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 66000 }, { - "lengthInSteps": 16, + "endTime": 69000, "sectionNotes": [ [ 67500, @@ -3121,12 +3120,12 @@ 183.5 ] ], - "endTime": 69000, - "startTime": 67500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 67500 }, { - "lengthInSteps": 16, + "endTime": 70500, "sectionNotes": [ [ 69000, @@ -3185,12 +3184,12 @@ 187.5 ] ], - "endTime": 70500, - "startTime": 69000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 69000 }, { - "lengthInSteps": 16, + "endTime": 72000, "sectionNotes": [ [ 70500, @@ -3256,12 +3255,12 @@ 191.5 ] ], - "endTime": 72000, - "startTime": 70500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 70500 }, { - "lengthInSteps": 16, + "endTime": 73500, "sectionNotes": [ [ 72000, @@ -3320,12 +3319,12 @@ 195 ] ], - "endTime": 73500, - "startTime": 72000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 72000 }, { - "lengthInSteps": 16, + "endTime": 75000, "sectionNotes": [ [ 73500, @@ -3377,12 +3376,12 @@ 199 ] ], - "endTime": 75000, - "startTime": 73500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 73500 }, { - "lengthInSteps": 16, + "endTime": 76500, "sectionNotes": [ [ 75000, @@ -3434,12 +3433,12 @@ 203 ] ], - "endTime": 76500, - "startTime": 75000, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 75000 }, { - "lengthInSteps": 16, + "endTime": 78000, "sectionNotes": [ [ 76500, @@ -3477,12 +3476,12 @@ 206 ] ], - "endTime": 78000, - "startTime": 76500, - "mustHitSection": false + "lengthInSteps": 16, + "mustHitSection": false, + "startTime": 76500 }, { - "lengthInSteps": 16, + "endTime": 79500, "sectionNotes": [ [ 78000, @@ -3534,12 +3533,12 @@ 211 ] ], - "endTime": 79500, - "startTime": 78000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 78000 }, { - "lengthInSteps": 16, + "endTime": 81000, "sectionNotes": [ [ 79500, @@ -3591,12 +3590,12 @@ 215 ] ], - "endTime": 81000, - "startTime": 79500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 79500 }, { - "lengthInSteps": 16, + "endTime": 82500, "sectionNotes": [ [ 81000, @@ -3648,12 +3647,12 @@ 219 ] ], - "endTime": 82500, - "startTime": 81000, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 81000 }, { - "lengthInSteps": 16, + "endTime": 84000, "sectionNotes": [ [ 82500, @@ -3698,270 +3697,270 @@ 223 ] ], - "endTime": 84000, - "startTime": 82500, - "mustHitSection": true + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 82500 }, { - "lengthInSteps": 16, - "sectionNotes": [], "endTime": 85500, - "startTime": 84000, - "mustHitSection": true + "sectionNotes": [], + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 84000 }, { - "lengthInSteps": 16, - "sectionNotes": [], "endTime": 87000, - "startTime": 85500, - "mustHitSection": true + "sectionNotes": [], + "lengthInSteps": 16, + "mustHitSection": true, + "startTime": 85500 }, { - "lengthInSteps": 16, + "endTime": 90000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 88500, - "changeBPM": false, - "endTime": 90000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 93000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 91500, - "changeBPM": false, - "endTime": 93000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 96000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 94500, - "changeBPM": false, - "endTime": 96000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 99000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 97500, - "changeBPM": false, - "endTime": 99000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 102000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 100500, - "changeBPM": false, - "endTime": 102000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 105000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 103500, - "changeBPM": false, - "endTime": 105000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 108000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 106500, - "changeBPM": false, - "endTime": 108000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 111000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 109500, - "changeBPM": false, - "endTime": 111000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 114000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 112500, - "changeBPM": false, - "endTime": 114000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 117000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 115500, - "changeBPM": false, - "endTime": 117000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 120000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 118500, - "changeBPM": false, - "endTime": 120000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 123000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 121500, - "changeBPM": false, - "endTime": 123000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 126000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 124500, - "changeBPM": false, - "endTime": 126000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 129000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 127500, - "changeBPM": false, - "endTime": 129000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 132000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 130500, - "changeBPM": false, - "endTime": 132000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 135000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 133500, - "changeBPM": false, - "endTime": 135000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 138000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 136500, - "changeBPM": false, - "endTime": 138000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 141000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 139500, - "changeBPM": false, - "endTime": 141000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { - "lengthInSteps": 16, + "endTime": 144000, + "playerAltAnim": false, "altAnim": false, "CPUAltAnim": false, + "mustHitSection": true, + "lengthInSteps": 16, "typeOfSection": 0, "sectionNotes": [], "bpm": 160, "startTime": 142500, - "changeBPM": false, - "endTime": 144000, - "playerAltAnim": false, - "mustHitSection": true + "changeBPM": false }, { "lengthInSteps": 16, @@ -4211,6 +4210,7 @@ "mustHitSection": true } ], + "player2": "tankman", "audioFile": "ugh", "offset": 0, "song": "Ugh", @@ -4257,7 +4257,7 @@ ], "stage": "tank", "needsVoices": true, - "noteStyle": "normal", - "bpm": 160 + "bpm": 160, + "noteStyle": "normal" } } \ No newline at end of file diff --git a/hmm.json b/hmm.json index 021160e1..0a52c65c 100644 --- a/hmm.json +++ b/hmm.json @@ -70,11 +70,10 @@ "version": null }, { - "name": "discord_rpc", + "name": "hxdiscord_rpc", "type": "git", - "dir": "discord_rpc", - "ref": "master", - "url": "https://github.com/Aidan63/linc_discord-rpc" + "ref": "main", + "url": "https://github.com/MAJigsaw77/hxdiscord_rpc.git" }, { "name": "openfl", diff --git a/source/Discord.hx b/source/Discord.hx index 1e11f504..685a6648 100644 --- a/source/Discord.hx +++ b/source/Discord.hx @@ -1,70 +1,48 @@ -package; - #if FEATURE_DISCORD -import Sys.sleep; -import discord_rpc.DiscordRpc; - -using StringTools; +import flixel.FlxG; +import hxdiscord_rpc.Discord as RichPresence; +import hxdiscord_rpc.Types; +import openfl.Lib; +import sys.thread.Thread; -class DiscordClient +class Discord { - public function new() - { - Debug.logTrace("Discord Client starting..."); - DiscordRpc.start({ - clientID: "898970552600002561", // change this to what ever the fuck you want lol - onReady: onReady, - onError: onError, - onDisconnected: onDisconnected - }); - Debug.logTrace("Discord Client started."); + public static var initialized(default, null):Bool = false; - while (true) - { - DiscordRpc.process(); - sleep(2); - // trace("Discord Client Update"); - } + public static function load():Void + { + if (initialized) + return; - DiscordRpc.shutdown(); - } + var handlers:DiscordEventHandlers = DiscordEventHandlers.create(); + handlers.ready = cpp.Function.fromStaticFunction(onReady); + handlers.disconnected = cpp.Function.fromStaticFunction(onDisconnected); + handlers.errored = cpp.Function.fromStaticFunction(onError); + RichPresence.Initialize("898970552600002561", cpp.RawPointer.addressOf(handlers), 1, null); - public static function shutdown() - { - DiscordRpc.shutdown(); - } + // Daemon Thread + Thread.create(function() + { + while (true) + { + #if DISCORD_DISABLE_IO_THREAD + RichPresence.UpdateConnection(); + #end + RichPresence.RunCallbacks(); - static function onReady() - { - DiscordRpc.presence({ - details: "In the Menus", - state: null, - largeImageKey: 'icon', - largeImageText: '${MainMenuState.kecVer}' + // Wait 0.5 seconds until the next loop... + Sys.sleep(0.5); + } }); - } - static function onError(_code:Int, _message:String) - { - trace('Error! $_code : $_message'); - } - - static function onDisconnected(_code:Int, _message:String) - { - Debug.logWarn('Disconnected! $_code : $_message'); - } + Lib.application.onExit.add((exitCode:Int) -> RichPresence.Shutdown()); - public static function initialize() - { - var DiscordDaemon = sys.thread.Thread.create(() -> - { - new DiscordClient(); - }); - Debug.logTrace("Discord Client initialized"); + initialized = true; } - public static function changePresence(details:String, state:Null, ?smallImageKey:String, ?hasStartTimestamp:Bool, ?endTimestamp:Float) + public static function changePresence(details:String, ?state:String, ?smallImageKey:String, ?hasStartTimestamp:Bool, ?endTimestamp:Float):Void { + var discordPresence:DiscordRichPresence = DiscordRichPresence.create(); var startTimestamp:Float = if (hasStartTimestamp) Date.now().getTime() else 0; if (endTimestamp > 0) @@ -72,18 +50,40 @@ class DiscordClient endTimestamp = startTimestamp + endTimestamp; } - DiscordRpc.presence({ - details: details, - state: state, - largeImageKey: 'icon', - largeImageText: '${MainMenuState.kecVer}', - smallImageKey: smallImageKey, - // Obtained times are in milliseconds so they are divided so Discord can use it - startTimestamp: Std.int(startTimestamp / 1000), - endTimestamp: Std.int(endTimestamp / 1000) - }); + discordPresence.details = details; - // trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp'); + if (state != null) + discordPresence.state = state; + + discordPresence.largeImageKey = "icon"; + discordPresence.largeImageText = '${MainMenuState.kecVer}'; + discordPresence.smallImageKey = smallImageKey; + // Obtained times are in milliseconds so they are divided so Discord can use it + discordPresence.startTimestamp = Std.int(startTimestamp / 1000); + discordPresence.endTimestamp = Std.int(endTimestamp / 1000); + RichPresence.UpdatePresence(cpp.RawConstPointer.addressOf(discordPresence)); + } + + private static function onReady(request:cpp.RawConstPointer):Void + { + final user:cpp.Star = cpp.ConstPointer.fromRaw(request).ptr; + + if (Std.parseInt(cast(user.discriminator, String)) != 0) + FlxG.log.notice('(Discord) Connected to User "${cast (user.username, String)}#${cast (user.discriminator, String)}"'); + else + FlxG.log.notice('(Discord) Connected to User "${cast (user.username, String)}"'); + + Discord.changePresence('Just Started'); + } + + private static function onDisconnected(errorCode:Int, message:cpp.ConstCharStar):Void + { + FlxG.log.notice('(Discord) Disconnected ($errorCode: ${cast (message, String)})'); + } + + private static function onError(errorCode:Int, message:cpp.ConstCharStar):Void + { + FlxG.log.notice('(Discord) Error ($errorCode: ${cast (message, String)})'); } } -#end +#end \ No newline at end of file diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 616ad77d..de36fff3 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -26,7 +26,7 @@ import flixel.util.FlxColor; import flixel.tweens.FlxTween; import openfl.utils.Assets as OpenFlAssets; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import FreeplaySubState; import Modifiers; @@ -140,7 +140,7 @@ class FreeplayState extends MusicBeatState #if FEATURE_DISCORD // Updating Discord Rich Presence - DiscordClient.changePresence("In the Freeplay Menu", null); + Discord.changePresence("In the Freeplay Menu", null); #end var isDebug:Bool = false; diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index f79c9454..053a6811 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -7,7 +7,7 @@ import flixel.FlxCamera; import flixel.math.FlxPoint; import flixel.FlxObject; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import flixel.group.FlxGroup.FlxTypedGroup; import openfl.ui.Keyboard; @@ -72,7 +72,7 @@ class GameplayCustomizeState extends MusicBeatState Paths.clearUnusedMemory(); #if FEATURE_DISCORD // Updating Discord Rich Presence - DiscordClient.changePresence("Customizing Gameplay Modules", null); + Discord.changePresence("Customizing Gameplay Modules", null); #end instance = this; diff --git a/source/Main.hx b/source/Main.hx index 721f11c5..027ad6e3 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -8,7 +8,7 @@ import openfl.Assets; import flixel.util.FlxColor; import openfl.display.Bitmap; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import openfl.Lib; import openfl.display.FPS; @@ -233,9 +233,6 @@ class Main extends Sprite Sys.println(errMsg); Sys.println("Crash dump saved in " + Path.normalize(path)); Application.current.window.alert(errMsg, "Error!"); - #if FEATURE_DISCORD - DiscordClient.shutdown(); - #end Sys.exit(1); } diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 44b30cbd..7a299b21 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -3,7 +3,7 @@ package; import Controls.KeyboardScheme; import flixel.util.FlxTimer; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import flixel.FlxG; import flixel.FlxObject; @@ -30,7 +30,7 @@ using StringTools; class MainMenuState extends MusicBeatState { public static var nightly:String = ""; - public static var kecVer:String = 'Kade Engine Community 1.9.2'; + public static var kecVer:String = 'Kade Engine Community 1.9.3'; public static var keVer:String = "Kade Engine 1.8.1"; public static var curSelected:Int = 0; public static var freakyPlaying:Bool = true; @@ -95,7 +95,7 @@ class MainMenuState extends MusicBeatState Paths.clearUnusedMemory(); #if FEATURE_DISCORD // Updating Discord Rich Presence - DiscordClient.changePresence("In the Menus", null); + Discord.changePresence("In the Menus", null); #end #if FEATURE_MODCORE diff --git a/source/Modifiers.hx b/source/Modifiers.hx index 882e3865..6e100fa3 100644 --- a/source/Modifiers.hx +++ b/source/Modifiers.hx @@ -7,9 +7,6 @@ import Controls.KeyboardScheme; import flixel.FlxG; import openfl.display.FPS; import openfl.Lib; -#if FEATURE_DISCORD -import Discord.DiscordClient; -#end import FreeplaySubState; // Used Options.hx code template to make this. Go to FreeplaySubState.hx to see the menu code :D diff --git a/source/NoteSplash.hx b/source/NoteSplash.hx index c8da4e06..09d10cbd 100644 --- a/source/NoteSplash.hx +++ b/source/NoteSplash.hx @@ -78,8 +78,17 @@ class NoteSplash extends FlxSprite else animation.play('splash ' + animNum + " " + note.originColor); var data:SplashData = cast rawJson; - var minFps = data.minFps; - var maxFps = data.maxFps; + var minFps = 24; + var maxFps = 26; + switch (PlayState.SONG.noteStyle) + { + case 'pixel': + minFps = 22; + maxFps = 26; + default: + minFps = data.minFps; + maxFps = data.maxFps; + } animation.curAnim.frameRate = FlxG.random.int(minFps, maxFps); diff --git a/source/PlayState.hx b/source/PlayState.hx index 4ad2d984..43a10a68 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -65,7 +65,7 @@ import flixel.util.FlxStringUtil; import flixel.util.FlxTimer; import openfl.filters.ShaderFilter; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end #if FEATURE_HSCRIPT import script.Script; @@ -411,6 +411,9 @@ class PlayState extends MusicBeatState // Self Explainitory. public static var startTime = 0.0; + // Week 7 Cutscenes. You Can Use It Your Own Way Too. + public var cutscene:VideoHandler; + // Adding Objects Using Lua public function addObject(object:FlxBasic) { @@ -579,7 +582,7 @@ class PlayState extends MusicBeatState detailsPausedText = "Paused - " + detailsText; // Updating Discord Rich Presence. - DiscordClient.changePresence(detailsText + Discord.changePresence(detailsText + " " + SONG.song + " (" @@ -1192,7 +1195,7 @@ class PlayState extends MusicBeatState cacheCountdown(); if (inCutscene) - removeStaticArrows(); + removeStaticArrows(true); if (isStoryMode) { @@ -2455,7 +2458,7 @@ class PlayState extends MusicBeatState #if FEATURE_DISCORD // Updating Discord Rich Presence (with Time Left) - DiscordClient.changePresence(detailsText + Discord.changePresence(detailsText + " " + SONG.song + " (" @@ -2779,12 +2782,8 @@ class PlayState extends MusicBeatState var noteTypeCheck:String = 'normal'; babyArrow.downScroll = PlayStateChangeables.useDownscroll; - babyArrow.loadLane(); - babyArrow.x += Note.swagWidth * i; - arrowLanes.add(babyArrow.bgLane); - if (tween) { babyArrow.y -= 10; @@ -2796,6 +2795,9 @@ class PlayState extends MusicBeatState babyArrow.ID = i; + babyArrow.loadLane(); + arrowLanes.add(babyArrow.bgLane); + babyArrow.animation.followGlobalSpeed = false; switch (player) @@ -2897,7 +2899,7 @@ class PlayState extends MusicBeatState } #if FEATURE_DISCORD - DiscordClient.changePresence("PAUSED on " + Discord.changePresence("PAUSED on " + SONG.song + " (" + storyDifficultyText @@ -2947,7 +2949,7 @@ class PlayState extends MusicBeatState #if FEATURE_DISCORD if (startTimer.finished) { - DiscordClient.changePresence(detailsText + Discord.changePresence(detailsText + " " + SONG.song + " (" @@ -2965,7 +2967,7 @@ class PlayState extends MusicBeatState } else { - DiscordClient.changePresence(detailsText, SONG.songName + " (" + storyDifficultyText + ") " + Ratings.GenerateLetterRank(accuracy), iconRPC); + Discord.changePresence(detailsText, SONG.songName + " (" + storyDifficultyText + ") " + Ratings.GenerateLetterRank(accuracy), iconRPC); } #end } @@ -3049,7 +3051,7 @@ class PlayState extends MusicBeatState } #if FEATURE_DISCORD - DiscordClient.changePresence(detailsText + Discord.changePresence(detailsText + " " + SONG.song + " (" @@ -3178,6 +3180,9 @@ class PlayState extends MusicBeatState scripts.executeAllFunc("update", [elapsed]); #end + if ((cutscene != null && cutscene.isPlaying && inCutscene)&& FlxG.keys.justPressed.ANY) + cutscene.onEndReached.dispatch(); + super.update(elapsed); if (FlxG.save.data.background) @@ -4138,7 +4143,7 @@ class PlayState extends MusicBeatState #if FEATURE_DISCORD // Game Over doesn't get his own variable because it's only used here - DiscordClient.changePresence("GAME OVER -- " + Discord.changePresence("GAME OVER -- " + SONG.song + " (" + storyDifficultyText @@ -4190,7 +4195,7 @@ class PlayState extends MusicBeatState isDead = true; #if FEATURE_DISCORD - DiscordClient.changePresence("GAME OVER -- " + Discord.changePresence("GAME OVER -- " + SONG.song + " (" + storyDifficultyText @@ -5179,7 +5184,7 @@ class PlayState extends MusicBeatState #if FEATURE_DISCORD // Updating Discord Rich Presence (with Time Left) - DiscordClient.changePresence(detailsText + Discord.changePresence(detailsText + " " + SONG.song + " (" @@ -6554,6 +6559,8 @@ class PlayState extends MusicBeatState arrowLanes.forEach(function(bgLane:FlxSprite) { arrowLanes.remove(bgLane, true); + if (destroy) + arrowLanes.destroy(); }); playerStrums.forEach(function(babyArrow:StaticArrow) @@ -6771,13 +6778,11 @@ class PlayState extends MusicBeatState { #if VIDEOS inCutscene = true; - var diff:String = CoolUtil.getSuffixFromDiff(CoolUtil.difficultyArray[storyDifficulty]); - - var video:VideoHandler = new VideoHandler(); - video.load(Paths.video(name)); + cutscene = new VideoHandler(); + cutscene.load(Paths.video(name)); inst.stop(); - video.onEndReached.add(function() + cutscene.onEndReached.add(function() { if (atend == true) { @@ -6792,9 +6797,9 @@ class PlayState extends MusicBeatState else startCountdown(); - video.dispose(); + cutscene.dispose(); }); - video.play(); + cutscene.play(); #else FlxG.log.warn("Platform Not Supported."); #end diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index cb0c0fbe..2bab7458 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -12,7 +12,7 @@ import flixel.util.FlxColor; import flixel.util.FlxTimer; import lime.app.Application; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import WeekData; @@ -102,7 +102,7 @@ class StoryMenuState extends MusicBeatState PlayState.inDaPlay = false; #if FEATURE_DISCORD // Updating Discord Rich Presence - DiscordClient.changePresence("In the Story Mode Menu", null); + Discord.changePresence("In the Story Mode Menu", null); #end transIn = FlxTransitionableState.defaultTransIn; diff --git a/source/TitleState.hx b/source/TitleState.hx index 371d4475..21d85264 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -2,7 +2,7 @@ package; import lime.app.Application; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end import flixel.FlxBasic; #if FEATURE_STEPMANIA @@ -61,12 +61,7 @@ class TitleState extends MusicBeatState #if FEATURE_DISCORD if (Main.gameContainer.hasWifi) { - Discord.DiscordClient.initialize(); - - Application.current.onExit.add(function(exitCode) - { - DiscordClient.shutdown(); - }); + Discord.load(); } #end diff --git a/source/debug/ChartingState.hx b/source/debug/ChartingState.hx index 81f46dad..2a864c9d 100644 --- a/source/debug/ChartingState.hx +++ b/source/debug/ChartingState.hx @@ -31,12 +31,8 @@ import openfl.media.Sound; import openfl.net.FileReference; import CoolUtil.CoolText; #if FEATURE_DISCORD -import Discord.DiscordClient; +import Discord; #end -#if FEATURE_DISCORD -import Discord.DiscordClient; -#end - using StringTools; @:access(flixel.system.FlxSound._sound) @@ -163,7 +159,7 @@ class ChartingState extends MusicBeatState } #if FEATURE_DISCORD - DiscordClient.changePresence("Chart Editor", null, null, true); + Discord.changePresence("Chart Editor", null, null, true); #end FlxG.mouse.visible = true; diff --git a/version.downloadMe b/version.downloadMe index 1ed0ee37..63507e59 100644 --- a/version.downloadMe +++ b/version.downloadMe @@ -1,4 +1,4 @@ -1.9.2; +1.9.3; -- Fix Week 7 Charts Breaking. -- Add Some More Functions To Stage Editor \ No newline at end of file +- Fully Fix Ugh Chart. +- Minor Bug Fixes. \ No newline at end of file