diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj index 1d43d8ca..5ed1f3f5 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj @@ -1201,7 +1201,23 @@ + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters index bf7bce59..149a7ec4 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters @@ -100,6 +100,9 @@ {e565fb16-43e6-4d18-a450-af7474df70b9} + + {eba9dd86-1d5d-4c68-8dcb-760c759099c0} + @@ -1235,6 +1238,54 @@ Header Files\steam + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + + + Scripts + diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 0806e0c2..2c7db02c 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 2 #define VERSION_PATCH 5 -#define VERSION_BUILD 11541 +#define VERSION_BUILD 11544 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/audio/bgm.txt b/Adventures in Lestoria/assets/config/audio/bgm.txt index b26bac4f..90605cd9 100644 --- a/Adventures in Lestoria/assets/config/audio/bgm.txt +++ b/Adventures in Lestoria/assets/config/audio/bgm.txt @@ -7,7 +7,7 @@ BGM { Track Name = Foresty - channel[0]=foresty_full1.ogg + channel[0]=commercial_assets/foresty_full1.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -25,7 +25,7 @@ BGM { Track Name = Overworld - channel[0]=overworld_v2.ogg + channel[0]=commercial_assets/overworld_v2.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -43,7 +43,7 @@ BGM { Track Name = Foresty Boss - channel[0]=foresty_boss.ogg + channel[0]=commercial_assets/foresty_boss.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -61,9 +61,9 @@ BGM { Track Name = Foresty Loop 2 - channel[0]=loop2/foresty1_1_loop2_bass.ogg - channel[1]=loop2/foresty1_1_loop2_staccato.ogg - channel[2]=loop2/foresty1_1_loop2_strings.ogg + channel[0]=commercial_assets/loop2/foresty1_1_loop2_bass.ogg + channel[1]=commercial_assets/loop2/foresty1_1_loop2_staccato.ogg + channel[2]=commercial_assets/loop2/foresty1_1_loop2_strings.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -82,16 +82,16 @@ BGM { Track Name = Base Camp - channel[0]=AIL_baseCamp_bass.ogg - channel[1]=AIL_baseCamp_flute.ogg - channel[2]=AIL_baseCamp_kick.ogg - channel[3]=AIL_baseCamp_piano1.ogg - channel[4]=AIL_baseCamp_piano2.ogg - channel[5]=AIL_baseCamp_pizzicato.ogg - channel[6]=AIL_baseCamp_ride.ogg - channel[7]=AIL_baseCamp_snare.ogg - channel[8]=AIL_baseCamp_strings.ogg - channel[9]=AIL_baseCamp_xtra perc.ogg + channel[0]=commercial_assets/AIL_baseCamp_bass.ogg + channel[1]=commercial_assets/AIL_baseCamp_flute.ogg + channel[2]=commercial_assets/AIL_baseCamp_kick.ogg + channel[3]=commercial_assets/AIL_baseCamp_piano1.ogg + channel[4]=commercial_assets/AIL_baseCamp_piano2.ogg + channel[5]=commercial_assets/AIL_baseCamp_pizzicato.ogg + channel[6]=commercial_assets/AIL_baseCamp_ride.ogg + channel[7]=commercial_assets/AIL_baseCamp_snare.ogg + channel[8]=commercial_assets/AIL_baseCamp_strings.ogg + channel[9]=commercial_assets/AIL_baseCamp_xtra perc.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -111,10 +111,10 @@ BGM { Track Name = Foresty Story - channel[0]=foresty1_1_drums.ogg - channel[1]=foresty1_1_flute.ogg - channel[2]=foresty1_1_strings.ogg - channel[3]=foresty1_1_xtra perc.ogg + channel[0]=commercial_assets/foresty1_1_drums.ogg + channel[1]=commercial_assets/foresty1_1_flute.ogg + channel[2]=commercial_assets/foresty1_1_strings.ogg + channel[3]=commercial_assets/foresty1_1_xtra perc.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -132,7 +132,7 @@ BGM { Track Name = Foresty - channel[0]=AiL_mountain2_2.ogg + channel[0]=commercial_assets/AiL_mountain2_2.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -150,7 +150,7 @@ BGM { Track Name = Mountain Boss - channel[0]=AiL_mountain_boss.ogg + channel[0]=commercial_assets/AiL_mountain_boss.ogg # Transition time between one phase to the next. Fade Time = 2.0 diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 1e92678f..3271d998 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg deleted file mode 100644 index 3ee0c7df..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg deleted file mode 100644 index 722fb4bd..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg deleted file mode 100644 index 86e0d491..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg deleted file mode 100644 index a751f518..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg deleted file mode 100644 index e73a90bd..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg deleted file mode 100644 index 320043ea..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg deleted file mode 100644 index a2aad9c1..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg deleted file mode 100644 index 5a894017..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg deleted file mode 100644 index 841c69a1..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_xtra perc.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_xtra perc.ogg deleted file mode 100644 index aa780831..00000000 Binary files a/Adventures in Lestoria/assets/music/AIL_baseCamp_xtra perc.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AiL_mountain2_2.ogg b/Adventures in Lestoria/assets/music/AiL_mountain2_2.ogg deleted file mode 100644 index 9f8760ba..00000000 Binary files a/Adventures in Lestoria/assets/music/AiL_mountain2_2.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg b/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg deleted file mode 100644 index 3c7b3f4f..00000000 Binary files a/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/base_camp.ogg b/Adventures in Lestoria/assets/music/base_camp.ogg deleted file mode 100644 index 809fc0b2..00000000 Binary files a/Adventures in Lestoria/assets/music/base_camp.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1.ogg b/Adventures in Lestoria/assets/music/foresty1_1.ogg deleted file mode 100644 index 320a86c6..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty1_1.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg b/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg deleted file mode 100644 index f31530dc..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg b/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg deleted file mode 100644 index 1a4a799f..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg b/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg deleted file mode 100644 index d224c118..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg b/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg deleted file mode 100644 index 39c887ec..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty_boss.ogg b/Adventures in Lestoria/assets/music/foresty_boss.ogg deleted file mode 100644 index 0591e88f..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty_boss.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/foresty_full1.ogg b/Adventures in Lestoria/assets/music/foresty_full1.ogg deleted file mode 100644 index 2e7684f5..00000000 Binary files a/Adventures in Lestoria/assets/music/foresty_full1.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg deleted file mode 100644 index e36729d2..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg deleted file mode 100644 index ad174227..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg deleted file mode 100644 index 5a0b058d..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg deleted file mode 100644 index 67b54fcd..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg deleted file mode 100644 index a2757388..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg deleted file mode 100644 index 4837c4b1..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg deleted file mode 100644 index 6f253257..00000000 Binary files a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg deleted file mode 100644 index 7b96712b..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg deleted file mode 100644 index d3e71dab..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg deleted file mode 100644 index 15a6f3e3..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg deleted file mode 100644 index a58824c8..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg deleted file mode 100644 index f7f28fee..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg deleted file mode 100644 index 6829a669..00000000 Binary files a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/overworld_v2.ogg b/Adventures in Lestoria/assets/music/overworld_v2.ogg deleted file mode 100644 index 8e02c51d..00000000 Binary files a/Adventures in Lestoria/assets/music/overworld_v2.ogg and /dev/null differ diff --git a/Adventures in Lestoria/olcPGEX_MiniAudio.h b/Adventures in Lestoria/olcPGEX_MiniAudio.h index 9027894a..fb1679fa 100644 --- a/Adventures in Lestoria/olcPGEX_MiniAudio.h +++ b/Adventures in Lestoria/olcPGEX_MiniAudio.h @@ -159,12 +159,8 @@ namespace olc std::vector vecSounds; std::vector vecOneOffSounds; struct ResourceData{ - ma_engine*engine; ResourceBuffer data; std::string pathName; - ~ResourceData(){ - if(ma_resource_manager_unregister_data(ma_engine_get_resource_manager(engine),pathName.data())!=MA_SUCCESS)ERR(std::format("WARNING! Could not clear resources for {}!",pathName)); - }; }; std::unordered_mapvecResourceData; }; @@ -332,7 +328,7 @@ namespace olc if(!foundSound)vecSounds.emplace_back(sound); if(soundType==BGM){ - vecResourceData[id]={&engine,game->gamepack.GetFileBuffer(path),path}; + vecResourceData[id]={game->gamepack.GetFileBuffer(path),path}; if(ma_resource_manager_register_encoded_data(ma_engine_get_resource_manager(&engine),path.data(),vecResourceData[id].data.vMemory.data(),vecResourceData[id].data.vMemory.size())!=MA_SUCCESS)ERR(std::format("WARNING! Could not load resources for {}!",path)); } if(ma_sound_init_from_file(&engine, path.c_str(), MA_SOUND_FLAG_DECODE | MA_SOUND_FLAG_ASYNC, NULL, NULL, sound) != MA_SUCCESS) @@ -346,7 +342,10 @@ namespace olc ma_sound_uninit(vecSounds.at(id)); delete vecSounds.at(id); vecSounds.at(id) = nullptr; - if(vecResourceData.count(id))vecResourceData.erase(id); + if(vecResourceData.count(id)){ + if(ma_resource_manager_unregister_data(ma_engine_get_resource_manager(&engine),vecResourceData[id].pathName.data())!=MA_SUCCESS)ERR(std::format("WARNING! Could not clear resources for {}!",vecResourceData[id].pathName)); + vecResourceData.erase(id); + } } void MiniAudio::Play(const int id, const bool loop) diff --git a/distribute.ps1 b/distribute.ps1 index a85334c7..bd65506c 100644 --- a/distribute.ps1 +++ b/distribute.ps1 @@ -11,6 +11,7 @@ rm -R bin/assets/backgrounds/commercial_assets rm -R bin/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" bin/assets cp -R "Adventures in Lestoria/assets/music" bin/assets +rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets cp -R "Adventures in Lestoria/assets/sounds" bin/assets cp -R "Adventures in Lestoria/assets/themes" bin/assets diff --git a/distribute.sh b/distribute.sh index 808c7db3..9e956082 100755 --- a/distribute.sh +++ b/distribute.sh @@ -11,6 +11,7 @@ rm -R release/assets/backgrounds/commercial_assets rm -R release/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" release/assets cp -R "Adventures in Lestoria/assets/music" release/assets +rm -R release/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" release/assets cp -R "Adventures in Lestoria/assets/sounds" release/assets cp -R "Adventures in Lestoria/assets/themes" release/assets diff --git a/emscripten_build.ps1 b/emscripten_build.ps1 index 2868617f..8f9a9950 100755 --- a/emscripten_build.ps1 +++ b/emscripten_build.ps1 @@ -12,6 +12,7 @@ rm -R bin/assets/backgrounds/commercial_assets rm -R bin/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" bin/assets cp -R "Adventures in Lestoria/assets/music" bin/assets +rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets cp -R "Adventures in Lestoria/assets/sounds" bin/assets cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets diff --git a/emscripten_build.sh b/emscripten_build.sh index bf6624ba..35a9ada2 100755 --- a/emscripten_build.sh +++ b/emscripten_build.sh @@ -3,16 +3,21 @@ clear mkdir bin mkdir bin/assets - +cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets cp -R "Adventures in Lestoria/assets/config" bin/assets cp -R "Adventures in Lestoria/assets/maps" bin/assets +cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets +rm -R bin/assets/backgrounds/commercial_assets rm -R bin/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" bin/assets cp -R "Adventures in Lestoria/assets/music" bin/assets +rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets cp -R "Adventures in Lestoria/assets/sounds" bin/assets cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets +cp -R "Adventures in Lestoria/assets/themes" bin/assets +cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets source ./emsdk/emsdk_env.sh emcmake cmake -DCMAKE_BUILD_TYPE=Release . diff --git a/emscripten_debug_build.ps1 b/emscripten_debug_build.ps1 index c04d2c7d..c2555168 100644 --- a/emscripten_debug_build.ps1 +++ b/emscripten_debug_build.ps1 @@ -13,6 +13,7 @@ rm -R bin/assets/backgrounds/commercial_assets rm -R bin/assets/maps/commercial_assets cp -R "Adventures in Lestoria/assets/monsters" bin/assets cp -R "Adventures in Lestoria/assets/music" bin/assets +rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets cp -R "Adventures in Lestoria/assets/sounds" bin/assets cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 515f7a88..008406f9 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ