diff --git a/Makefile b/Makefile index 5746014..6e787ad 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 ?= DEBUG +BUILD_MODE ?= RELEASE # 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 4354c4b..d457d59 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ 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 f858ffb..0bc554a 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": 22, + "loopBars": 10, "beatsPerBar": 8, "ticksPerBeat": 4, "beatsPerMinute": 120, @@ -18,7 +18,7 @@ "type": "FM", "volume": 40, "eqFilter": [], - "preset": 199, + "preset": 256, "effects": [ "chord type", "note filter", @@ -28,32 +28,32 @@ "noteFilter": [ { "type": "low-pass", - "cutoffHz": 2378.41, + "cutoffHz": 6727.17, "linearGain": 0.5 } ], "reverb": 33, "fadeInSeconds": 0, - "fadeOutTicks": -3, - "algorithm": "(1 2 3)←4", - "feedbackType": "1⟲ 2⟲ 3⟲", - "feedbackAmplitude": 0, + "fadeOutTicks": 48, + "algorithm": "1←2←3←4", + "feedbackType": "3⟲", + "feedbackAmplitude": 6, "operators": [ { "frequency": "1×", - "amplitude": 9 + "amplitude": 15 }, { - "frequency": "6×", - "amplitude": 9 - }, - { - "frequency": "11×", - "amplitude": 9 - }, - { - "frequency": "20×", + "frequency": "1×", "amplitude": 6 + }, + { + "frequency": "5×", + "amplitude": 2 + }, + { + "frequency": "7×", + "amplitude": 4 } ], "envelopes": [ @@ -62,9 +62,8 @@ "envelope": "twang 1" }, { - "target": "operatorAmplitude", - "envelope": "twang 1", - "index": 3 + "target": "feedbackAmplitude", + "envelope": "twang 1" } ] } @@ -625,852 +624,7 @@ ] }, { - "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": [] }, { "notes": [] @@ -1498,19 +652,7 @@ 1, 2, 2, - 2, - 2, - 2, - 3, - 3, - 3, - 3, - 3, - 4, - 4, - 4, - 5, - 0 + 2 ], "octaveScrollBar": 3 }, @@ -1527,12 +669,11 @@ "linearGain": 0.5 } ], + "preset": 194, "effects": [ - "vibrato", "reverb" ], - "vibrato": "light", - "reverb": 67, + "reverb": 33, "fadeInSeconds": 0, "fadeOutTicks": 48, "harmonics": [ @@ -2032,757 +1173,16 @@ ] }, { - "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 - } - ] - } - ] + "notes": [] } ], "sequence": [ @@ -2795,19 +1195,7 @@ 2, 0, 3, - 4, - 4, - 0, - 0, - 5, - 5, - 6, - 6, - 7, - 9, - 10, - 8, - 0 + 4 ], "octaveScrollBar": 2 }, @@ -3279,7 +1667,7 @@ }, { "pitches": [ - 24 + 36 ], "points": [ { @@ -3296,16 +1684,16 @@ }, { "pitches": [ - 38 + 34 ], "points": [ { - "tick": 20, + "tick": 16, "pitchBend": 0, "volume": 100 }, { - "tick": 21, + "tick": 20, "pitchBend": 0, "volume": 100 } @@ -3317,7 +1705,7 @@ ], "points": [ { - "tick": 21, + "tick": 20, "pitchBend": 0, "volume": 100 }, @@ -3355,23 +1743,6 @@ "pitchBend": 0, "volume": 100 }, - { - "tick": 25, - "pitchBend": 0, - "volume": 100 - } - ] - }, - { - "pitches": [ - 38 - ], - "points": [ - { - "tick": 25, - "pitchBend": 0, - "volume": 100 - }, { "tick": 26, "pitchBend": 0, @@ -3406,702 +1777,6 @@ "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, @@ -4115,309 +1790,13 @@ "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": [ - { - "pitches": [ - 46, - 43, - 39, - 34 - ], - "points": [ - { - "tick": 0, - "pitchBend": 0, - "volume": 100 - }, - { - "tick": 32, - "pitchBend": 0, - "volume": 100 - } - ], - "continuesLastPattern": true - } - ] + "notes": [] + }, + { + "notes": [] }, { "notes": [] @@ -4433,19 +1812,7 @@ 2, 0, 0, - 0, - 3, - 0, - 0, - 0, - 5, - 0, - 6, - 0, - 0, - 8, - 9, - 0 + 3 ], "octaveScrollBar": 1 }, @@ -4908,12 +2275,6 @@ { "notes": [] }, - { - "notes": [] - }, - { - "notes": [] - }, { "notes": [] } @@ -4928,18 +2289,6 @@ 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 e1f7d37..85bb39d 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 aa78d66..fb58857 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 CheckAttackActivity(struct Attack attack[], int val, int max) +bool CheckFireworkActivity(void) { - int matches = 0; - for (int i = 0; i < max; i++) { - if (attack[i].active == val) matches++; + int matches = 0, val = 0; + for (int i = 0; i < MAX_FIREWORKS; i++) { + if (fireworks[i].active == val) matches++; } - if (matches == max) return true; + if (matches == MAX_FIREWORKS) return true; else return false; } @@ -51,8 +51,6 @@ void InitGameplayScreen(void) finishfromGameplayScreen = 0; - nextlevel = level + 1; - globalTimer = 0; if (player.hp < 1) player.hp = 1; @@ -195,7 +193,7 @@ void UpdateGameplayScreen(void) if (INPUT_OPTION_PRESSED) pause = !pause; // code to end the game if (level > 2) { StopMusicStream(Gameplaysong); finishfromGameplayScreen = 3; } - if (CheckAttackActivity(fireworks, 0, MAX_FIREWORKS) && level < 2) { StopMusicStream(Gameplaysong); levelunlocked[nextlevel] = true; finishfromGameplayScreen = 4; } + if (CheckFireworkActivity() && level < 2) { StopMusicStream(Gameplaysong); levelunlocked[nextlevel] = true; nextlevel++; finishfromGameplayScreen = 4; } if (!mute) UpdateMusicStream(Gameplaysong); @@ -310,8 +308,6 @@ void UpdateGameplayScreen(void) enemy.hitbox.y = GetRandomValue(0, GetScreenHeight()); shoot[i].active = false; } - if (((shoot[i].hitbox.x + -attack_sprite.width) > GetScreenWidth() - || (shoot[i].hitbox.x <= -attack_sprite.width))) shoot[i].active = 0; } if (enemy.hp < 1) { level++; enemy.hp = 5; } @@ -323,13 +319,14 @@ void UpdateGameplayScreen(void) DamageActor(&player); fireworks[i].active = 0; } - for (int j = 0; j < MAX_SHOOTS; j++) { + /* for (int j = 0; j < MAX_SHOOTS; j++) { if (CheckCollisionRecs(shoot[j].hitbox, fireworks[i].hitbox) && shoot[j].active) { if (!mute) PlaySoundMulti(enemy.fxhit); fireworks[i].active = 0; fireworkAmount--; + shoot[j].active = 0; } - } + } */ switch (fireworks[i].active) { case 0: fireworks[i].hitbox.x = GetScreenWidth() + firework_sprite.width; diff --git a/src/LevelSel.c b/src/LevelSel.c index 268f407..fd0fd42 100644 --- a/src/LevelSel.c +++ b/src/LevelSel.c @@ -18,6 +18,8 @@ bool levelunlocked[3] = {1, 0 , 0}; void InitLevelSelScreen(void) { + nextlevel = level + 1; + feather_sprite = LoadTexture("assets/gfx/feather.png"); finishfromLevelSelScreen = 0; } @@ -57,7 +59,7 @@ void DrawLevelSelScreen(void) else DrawText("3", 300, 220, 60, GRAY); // printf("%d, %d, %d\n", levelunlocked[0], levelunlocked[1], levelunlocked[2]); - // printf("%d\n", levelunlocked[nextlevel]); + printf("%d\n", levelunlocked[nextlevel]); } void UnloadLevelSelScreen(void)