diff --git a/Makefile b/Makefile index 6e787ad..5746014 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ RAYLIB_LIB_PATH ?= /usr/local/lib RAYLIB_LIBTYPE ?= STATIC # Build mode for project: DEBUG or RELEASE -BUILD_MODE ?= RELEASE +BUILD_MODE ?= DEBUG # Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system) # NOTE: This variable is only used for PLATFORM_OS: LINUX diff --git a/README.md b/README.md index d457d59..4354c4b 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,6 @@ A dumb raylib test which you can play [here](https://canneddonuts.itch.io/avoid- - a build guide - a tutorial -## Note -This game's code more specifically 'Main.c' is a retyped version of this [repo](https://github.com/raysan5/raylib-game-template) which is code under the zlib license. - ## Preview ![Alt Text](./doc-assets/preview.png) ![Alt Text](./doc-assets/preview1.png) diff --git a/asset-src/bgm/04-Distant-Misadventure.json b/asset-src/bgm/04-Distant-Misadventure.json index 0bc554a..f858ffb 100644 --- a/asset-src/bgm/04-Distant-Misadventure.json +++ b/asset-src/bgm/04-Distant-Misadventure.json @@ -4,7 +4,7 @@ "scale": "normal :(", "key": "C", "introBars": 0, - "loopBars": 10, + "loopBars": 22, "beatsPerBar": 8, "ticksPerBeat": 4, "beatsPerMinute": 120, @@ -18,7 +18,7 @@ "type": "FM", "volume": 40, "eqFilter": [], - "preset": 256, + "preset": 199, "effects": [ "chord type", "note filter", @@ -28,32 +28,32 @@ "noteFilter": [ { "type": "low-pass", - "cutoffHz": 6727.17, + "cutoffHz": 2378.41, "linearGain": 0.5 } ], "reverb": 33, "fadeInSeconds": 0, - "fadeOutTicks": 48, - "algorithm": "1←2←3←4", - "feedbackType": "3⟲", - "feedbackAmplitude": 6, + "fadeOutTicks": -3, + "algorithm": "(1 2 3)←4", + "feedbackType": "1⟲ 2⟲ 3⟲", + "feedbackAmplitude": 0, "operators": [ { "frequency": "1×", - "amplitude": 15 + "amplitude": 9 }, { - "frequency": "1×", + "frequency": "6×", + "amplitude": 9 + }, + { + "frequency": "11×", + "amplitude": 9 + }, + { + "frequency": "20×", "amplitude": 6 - }, - { - "frequency": "5×", - "amplitude": 2 - }, - { - "frequency": "7×", - "amplitude": 4 } ], "envelopes": [ @@ -62,8 +62,9 @@ "envelope": "twang 1" }, { - "target": "feedbackAmplitude", - "envelope": "twang 1" + "target": "operatorAmplitude", + "envelope": "twang 1", + "index": 3 } ] } @@ -624,7 +625,852 @@ ] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 1, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 2, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 3, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 9, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 9, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 50 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 50 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 50 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 50 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 26, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 26, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 27, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 27, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 28, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 58 + ], + "points": [ + { + "tick": 28, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 29, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 60 + ], + "points": [ + { + "tick": 29, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 30, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 58 + ], + "points": [ + { + "tick": 30, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 31, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 31, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 1, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 2, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 3, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 9, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 26, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 27, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 28, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 29, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 30, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 31, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 1, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 2, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 3, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 9, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 26, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 28, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] }, { "notes": [] @@ -652,7 +1498,19 @@ 1, 2, 2, - 2 + 2, + 2, + 2, + 3, + 3, + 3, + 3, + 3, + 4, + 4, + 4, + 5, + 0 ], "octaveScrollBar": 3 }, @@ -669,11 +1527,12 @@ "linearGain": 0.5 } ], - "preset": 194, "effects": [ + "vibrato", "reverb" ], - "reverb": 33, + "vibrato": "light", + "reverb": 67, "fadeInSeconds": 0, "fadeOutTicks": 48, "harmonics": [ @@ -1173,16 +2032,757 @@ ] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 41 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 41 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 38 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 38 + ], + "points": [ + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 41 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 50 + ], + "points": [ + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 53 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 60 + ], + "points": [ + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 58 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 58, + 55, + 51, + 46 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": true + } + ] + }, + { + "notes": [ + { + "pitches": [ + 55 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 51 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 48 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 43, + 39 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 39, + 34 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 41, + 46 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46, + 51, + 55, + 58 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] } ], "sequence": [ @@ -1195,7 +2795,19 @@ 2, 0, 3, - 4 + 4, + 4, + 0, + 0, + 5, + 5, + 6, + 6, + 7, + 9, + 10, + 8, + 0 ], "octaveScrollBar": 2 }, @@ -1667,7 +3279,7 @@ }, { "pitches": [ - 36 + 24 ], "points": [ { @@ -1684,16 +3296,16 @@ }, { "pitches": [ - 34 + 38 ], "points": [ { - "tick": 16, + "tick": 20, "pitchBend": 0, "volume": 100 }, { - "tick": 20, + "tick": 21, "pitchBend": 0, "volume": 100 } @@ -1705,7 +3317,7 @@ ], "points": [ { - "tick": 20, + "tick": 21, "pitchBend": 0, "volume": 100 }, @@ -1743,6 +3355,23 @@ "pitchBend": 0, "volume": 100 }, + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 38 + ], + "points": [ + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + }, { "tick": 26, "pitchBend": 0, @@ -1777,6 +3406,702 @@ "pitchBend": 0, "volume": 100 }, + { + "tick": 29, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 31 + ], + "points": [ + { + "tick": 30, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 31, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 29, + 17 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 32 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 27 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 29 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 31 + ], + "points": [ + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 29 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 31 + ], + "points": [ + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 32 + ], + "points": [ + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 32 + ], + "points": [ + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 1, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 2, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 3, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 5, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 32 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 9, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 32 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 13, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 31 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 17, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 31 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 34 + ], + "points": [ + { + "tick": 21, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 23, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 25, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 26, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 27, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36, + 24 + ], + "points": [ + { + "tick": 28, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] + }, + { + "notes": [ + { + "pitches": [ + 27 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 26 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 24 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 22 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 20 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 19 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 17 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, { "tick": 32, "pitchBend": 0, @@ -1790,13 +4115,309 @@ "notes": [] }, { - "notes": [] + "notes": [ + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": false + }, + { + "pitches": [ + 41 + ], + "points": [ + { + "tick": 4, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 6, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 7, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 8, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 10, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46 + ], + "points": [ + { + "tick": 11, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 44 + ], + "points": [ + { + "tick": 12, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 14, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 43 + ], + "points": [ + { + "tick": 15, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 41 + ], + "points": [ + { + "tick": 16, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 18, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 39 + ], + "points": [ + { + "tick": 19, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 20, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 36 + ], + "points": [ + { + "tick": 22, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + } + ] + }, + { + "pitches": [ + 46, + 43, + 39, + 34 + ], + "points": [ + { + "tick": 24, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ] + } + ] }, { - "notes": [] - }, - { - "notes": [] + "notes": [ + { + "pitches": [ + 46, + 43, + 39, + 34 + ], + "points": [ + { + "tick": 0, + "pitchBend": 0, + "volume": 100 + }, + { + "tick": 32, + "pitchBend": 0, + "volume": 100 + } + ], + "continuesLastPattern": true + } + ] }, { "notes": [] @@ -1812,7 +4433,19 @@ 2, 0, 0, - 3 + 0, + 3, + 0, + 0, + 0, + 5, + 0, + 6, + 0, + 0, + 8, + 9, + 0 ], "octaveScrollBar": 1 }, @@ -2275,6 +4908,12 @@ { "notes": [] }, + { + "notes": [] + }, + { + "notes": [] + }, { "notes": [] } @@ -2289,6 +4928,18 @@ 0, 0, 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 0 ] } diff --git a/assets/bgm/04-Distant-Misadventure.ogg b/assets/bgm/04-Distant-Misadventure.ogg index 85bb39d..e1f7d37 100644 Binary files a/assets/bgm/04-Distant-Misadventure.ogg and b/assets/bgm/04-Distant-Misadventure.ogg differ diff --git a/src/Gameplay.c b/src/Gameplay.c index 9e829e0..aa78d66 100644 --- a/src/Gameplay.c +++ b/src/Gameplay.c @@ -21,14 +21,14 @@ int score = 0, bestscore = 0, finishfromGameplayScreen = 0, redfeathers = 0, gre Music Gameplaysong = { 0 }; -bool CheckFireworkActivity(void) +bool CheckAttackActivity(struct Attack attack[], int val, int max) { - int matches = 0, val = 0; - for (int i = 0; i < MAX_FIREWORKS; i++) { - if (fireworks[i].active == val) matches++; + int matches = 0; + for (int i = 0; i < max; i++) { + if (attack[i].active == val) matches++; } - if (matches == MAX_FIREWORKS) return true; + if (matches == max) return true; else return false; } @@ -195,7 +195,7 @@ void UpdateGameplayScreen(void) if (INPUT_OPTION_PRESSED) pause = !pause; // code to end the game if (level > 2) { StopMusicStream(Gameplaysong); finishfromGameplayScreen = 3; } - if (CheckFireworkActivity() && level < 2) { StopMusicStream(Gameplaysong); levelunlocked[nextlevel] = true; finishfromGameplayScreen = 4; } + if (CheckAttackActivity(fireworks, 0, MAX_FIREWORKS) && level < 2) { StopMusicStream(Gameplaysong); levelunlocked[nextlevel] = true; finishfromGameplayScreen = 4; } if (!mute) UpdateMusicStream(Gameplaysong); @@ -329,7 +329,7 @@ void UpdateGameplayScreen(void) fireworks[i].active = 0; fireworkAmount--; } - } + } switch (fireworks[i].active) { case 0: fireworks[i].hitbox.x = GetScreenWidth() + firework_sprite.width;