diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index c33865d4..b469a16a 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -197,7 +197,11 @@ "Birds2", "Birds3", "Birds4", - "Campfire" + "Campfire", + "Crashing Waves", + "Gull1", + "Gull2", + "Gull3" ], "valuesAsFlags": false }, diff --git a/Adventures in Lestoria/EnvironmentalAudio.cpp b/Adventures in Lestoria/EnvironmentalAudio.cpp index 6c5ad619..acebfdc0 100644 --- a/Adventures in Lestoria/EnvironmentalAudio.cpp +++ b/Adventures in Lestoria/EnvironmentalAudio.cpp @@ -68,6 +68,7 @@ void EnvironmentalAudio::SetAudioName(const std::string_view audioName){ void EnvironmentalAudio::Activate(){ if(activated)return; soundInstance=Audio::LoadAndPlaySFX(operator""_SFX(SOUND_DATA[audioName].file.c_str(),SOUND_DATA[audioName].file.length()),true); + Audio::Engine().SetPitch(soundInstance,util::random_range(0.9f,1.1f)); activated=true; } void EnvironmentalAudio::Deactivate(){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 67b38b8e..8f136df9 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 11666 +#define VERSION_BUILD 11667 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/3_1.tmx b/Adventures in Lestoria/assets/Campaigns/3_1.tmx index 71332dba..8382ae59 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_1.tmx @@ -1,5 +1,5 @@ - + @@ -876,5 +876,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_2.tmx b/Adventures in Lestoria/assets/Campaigns/3_2.tmx index db30a4f7..a75d561f 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_2.tmx @@ -1,5 +1,5 @@ - + @@ -1477,5 +1477,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_3.tmx b/Adventures in Lestoria/assets/Campaigns/3_3.tmx index 28062bbc..cb01122d 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_3.tmx @@ -1,5 +1,5 @@ - + @@ -867,5 +867,389 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_4.tmx b/Adventures in Lestoria/assets/Campaigns/3_4.tmx index 14ff880c..72f86295 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_4.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_4.tmx @@ -1,5 +1,5 @@ - + @@ -2185,5 +2185,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_5.tmx b/Adventures in Lestoria/assets/Campaigns/3_5.tmx index 41c3f2a8..bd8c9467 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_5.tmx @@ -1,5 +1,5 @@ - + @@ -1082,5 +1082,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_6.tmx b/Adventures in Lestoria/assets/Campaigns/3_6.tmx index 78984978..9d3a9b12 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_6.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_6.tmx @@ -1,5 +1,5 @@ - + @@ -1827,5 +1827,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_7.tmx b/Adventures in Lestoria/assets/Campaigns/3_7.tmx index c70de8ae..c60aced8 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_7.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_7.tmx @@ -1,5 +1,5 @@ - + @@ -855,5 +855,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_8.tmx b/Adventures in Lestoria/assets/Campaigns/3_8.tmx index 97173f63..4f212b07 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_8.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_8.tmx @@ -1,5 +1,5 @@ - + @@ -1892,5 +1892,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/3_B1.tmx b/Adventures in Lestoria/assets/Campaigns/3_B1.tmx index 1d9c2273..39b74574 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_B1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_B1.tmx @@ -1,5 +1,5 @@ - + @@ -1270,5 +1270,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_3.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_3.tmx index 4472ab42..46165786 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_3.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_3.tmx @@ -1,5 +1,5 @@ - + @@ -456,5 +456,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx index 9fef0be8..d221f39c 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_3_B.tmx @@ -1,5 +1,5 @@ - + @@ -289,5 +289,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/config/audio/environmentalaudio.txt b/Adventures in Lestoria/assets/config/audio/environmentalaudio.txt index 5de00ed3..0338f5f9 100644 --- a/Adventures in Lestoria/assets/config/audio/environmentalaudio.txt +++ b/Adventures in Lestoria/assets/config/audio/environmentalaudio.txt @@ -30,4 +30,24 @@ Environmental Audio File = campfire.ogg Volume = 100% } + Crashing Waves + { + File = crashing_waves.ogg + Volume = 100% + } + Gull1 + { + File = gull_01.ogg + Volume = 80% + } + Gull2 + { + File = gull_02.ogg + Volume = 60% + } + Gull3 + { + File = gull_03.ogg + Volume = 60% + } } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/config/credits.txt b/Adventures in Lestoria/assets/config/credits.txt index 8860427c..f83e3ed5 100644 --- a/Adventures in Lestoria/assets/config/credits.txt +++ b/Adventures in Lestoria/assets/config/credits.txt @@ -62,22 +62,24 @@ Credits LINE[59]=" " LINE[60]="Spells and Company by LittleFieryOne" LINE[61]=" " - LINE[62]=" " + LINE[62]="Gull sounds by Jonathon Jongsma https://www.xeno-canto.org/75111" LINE[63]=" " - LINE[64]="Game License" - LINE[65]="~~~~~~~~~~~~~~~~" - LINE[66]="License (OLC-3)" - LINE[67]="~~~~~~~~~~~~~~~" - LINE[68]=" " - LINE[69]="Copyright ` 2024 Sig Productions " + LINE[64]=" " + LINE[65]=" " + LINE[66]="Game License" + LINE[67]="~~~~~~~~~~~~~~~~" + LINE[68]="License (OLC-3)" + LINE[69]="~~~~~~~~~~~~~~~" LINE[70]=" " - LINE[71]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:" + LINE[71]="Copyright ` 2024 Sig Productions " LINE[72]=" " - LINE[73]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer." + LINE[73]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:" LINE[74]=" " - LINE[75]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution." + LINE[75]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer." LINE[76]=" " - LINE[77]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission." + LINE[77]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution." LINE[78]=" " - LINE[79]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + LINE[79]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission." + LINE[80]=" " + LINE[81]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/sounds/crashing_waves.ogg b/Adventures in Lestoria/assets/sounds/crashing_waves.ogg new file mode 100644 index 00000000..f8c34947 Binary files /dev/null and b/Adventures in Lestoria/assets/sounds/crashing_waves.ogg differ diff --git a/Adventures in Lestoria/assets/sounds/gull_01.ogg b/Adventures in Lestoria/assets/sounds/gull_01.ogg new file mode 100644 index 00000000..adc7c04d Binary files /dev/null and b/Adventures in Lestoria/assets/sounds/gull_01.ogg differ diff --git a/Adventures in Lestoria/assets/sounds/gull_02.ogg b/Adventures in Lestoria/assets/sounds/gull_02.ogg new file mode 100644 index 00000000..4e527872 Binary files /dev/null and b/Adventures in Lestoria/assets/sounds/gull_02.ogg differ diff --git a/Adventures in Lestoria/assets/sounds/gull_03.ogg b/Adventures in Lestoria/assets/sounds/gull_03.ogg new file mode 100644 index 00000000..431a3f3c Binary files /dev/null and b/Adventures in Lestoria/assets/sounds/gull_03.ogg differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 25cacee4..aeb31715 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ