diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index c66b6fde..5f23812a 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -50,7 +50,7 @@ "foresty1_1", "overworld", "foresty_boss", - "foresty_loop1" + "base_camp" ], "valuesAsFlags": false }, diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index ba2a0e14..81468f41 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -240,6 +240,7 @@ AiL::AiL() } bool AiL::OnUserCreate(){ + if(PACK_KEY=="INSERT_PACK_KEY_HERE")ERR("ERROR! Starting the game with the default pack ID is not allowed!") gamepack.LoadPack("assets/"+"gamepack_file"_S,PACK_KEY); GamePad::init(); @@ -2700,7 +2701,6 @@ bool Steam_Init(){ int main() { - if(PACK_KEY=="INSERT_PACK_KEY_HERE")ERR("ERROR! Starting the game with the default pack ID is not allowed!") #ifndef __EMSCRIPTEN__ if(SteamAPI_RestartAppIfNecessary(2895980U))return false; //Immediately quit if steam is detected and can be started through it. if(Steam_Init()){ diff --git a/Adventures in Lestoria/State_GameHub.cpp b/Adventures in Lestoria/State_GameHub.cpp index 4ec2c0d2..f1219ed5 100644 --- a/Adventures in Lestoria/State_GameHub.cpp +++ b/Adventures in Lestoria/State_GameHub.cpp @@ -68,6 +68,12 @@ void State_GameHub::OnStateChange(GameState*prevState){ } void State_GameHub::OnLevelLoad(){ game->UpdateDiscordStatus("Camp",game->GetPlayer()->GetClassName()); + if(Unlock::IsUnlocked("STORY_1_3")){ + Audio::SetAudioEvent("Chapter2Unlock"); + }else + if(Unlock::IsUnlocked("STORY_1_2")){ + Audio::SetAudioEvent("BlacksmithUnlock"); + } } void State_GameHub::OnUserUpdate(AiL*game){ State_GameRun::OnUserUpdate(game); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index be893a99..9d9f12dc 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 0 #define VERSION_PATCH 0 -#define VERSION_BUILD 8472 +#define VERSION_BUILD 8476 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx b/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx index e546d611..c8b2677d 100644 --- a/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Hub_v2.tmx @@ -1,8 +1,8 @@ - + - + diff --git a/Adventures in Lestoria/assets/config/audio/bgm.txt b/Adventures in Lestoria/assets/config/audio/bgm.txt index daddd4bc..9158641f 100644 --- a/Adventures in Lestoria/assets/config/audio/bgm.txt +++ b/Adventures in Lestoria/assets/config/audio/bgm.txt @@ -31,9 +31,6 @@ BGM Events { Default Volume = 70% - LowHealth = 100% - InCombat = 100% - Underwater = 100% } } @@ -50,9 +47,6 @@ BGM Events { Default Volume = 70% - LowHealth = 100% - InCombat = 100% - Underwater = 100% } } @@ -79,24 +73,29 @@ BGM } #Song title followed by filenames for individual parts - foresty_loop1 + base_camp { - Track Name = Foresty Loop 1 - - channel[0]=loop1/foresty1_1_loop1_bass.ogg - channel[1]=loop1/foresty1_1_loop1_drums.ogg - channel[2]=loop1/foresty1_1_loop1_flute.ogg - channel[3]=loop1/foresty1_1_loop1_piano 1.ogg - channel[4]=loop1/foresty1_1_loop1_piano 2.ogg - channel[5]=loop1/foresty1_1_loop1_strings.ogg - channel[6]=loop1/foresty1_1_loop1_xtra perc.ogg + 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 # Transition time between one phase to the next. Fade Time = 2.0 Events { - Default Volume = 0%,70%,0%,0%,70%,70%,0% + Default Volume = 60%,60%,0%,0%,0%,0%,0%,0%,60%,60% + BlacksmithUnlock = 60%,60%,60%,0%,0%,0%,0%,60%,60%,60% + Chapter2Unlock = 80%,80%,60%,0%,100%,70%,0%,60%,80%,60% } } diff --git a/Adventures in Lestoria/assets/config/audio/events.txt b/Adventures in Lestoria/assets/config/audio/events.txt index caca40fe..bab2d69a 100644 --- a/Adventures in Lestoria/assets/config/audio/events.txt +++ b/Adventures in Lestoria/assets/config/audio/events.txt @@ -1,9 +1,9 @@ Events { LowHealth = "Occurs when the player is low in health." - InCombat = "Occurs when the player is in combat." - Underwater = "Occurs when the player is in water." TitleScreenLoaded = "Occurs when the title screen intro is done" + BlacksmithUnlock = "Blacksmith appears in the camp." + Chapter2Unlock = "Chapter 2 is unlocked (beat the demo)" SFX { diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg new file mode 100644 index 00000000..3ee0c7df Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_bass.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg new file mode 100644 index 00000000..722fb4bd Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_flute.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg new file mode 100644 index 00000000..86e0d491 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_kick.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg new file mode 100644 index 00000000..a751f518 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano1.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg new file mode 100644 index 00000000..e73a90bd Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_piano2.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg new file mode 100644 index 00000000..320043ea Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_pizzicato.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg new file mode 100644 index 00000000..a2aad9c1 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_ride.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg new file mode 100644 index 00000000..5a894017 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_snare.ogg differ diff --git a/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg b/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg new file mode 100644 index 00000000..841c69a1 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_strings.ogg 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 new file mode 100644 index 00000000..aa780831 Binary files /dev/null and b/Adventures in Lestoria/assets/music/AIL_baseCamp_xtra perc.ogg differ diff --git a/Adventures in Lestoria/assets/music/base_camp.ogg b/Adventures in Lestoria/assets/music/base_camp.ogg new file mode 100644 index 00000000..809fc0b2 Binary files /dev/null and b/Adventures in Lestoria/assets/music/base_camp.ogg differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 5a076b3f..0326ce79 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ