sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Fixed up map links for new stage plates. Add in checking to prevent crashes for undefined audio in maps. Release Build 12250.
All checks were successful
Emscripten Build / Build_and_Deploy_Web_Build (push) Successful in 9m40s
Details

Browse Source
This commit is contained in:
sigonasr2 2025-08-08 08:06:51 -05:00
parent 62eedd95c5
commit 73e79bd90c
5 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Adventures in Lestoria/Adventures in Lestoria.tiled-project
View File

@ -309,7 +309,19 @@
"BOSS_3",
"BOSS_3_B",
"STORY_3_1",
"STORY_3_2"
"STORY_3_2",
"STORY_4_1",
"CAMPAIGN_4_1",
"CAMPAIGN_4_2",
"CAMPAIGN_4_3",
"CAMPAIGN_4_4",
"CAMPAIGN_4_5",
"CAMPAIGN_4_6",
"CAMPAIGN_4_7",
"CAMPAIGN_4_8",
"CAMPAIGN_4_B1",
"BOSS_4",
"BOSS_4_B"
],
"valuesAsFlags": false
},

24
Adventures in Lestoria/AdventuresInLestoria.cpp
View File

@ -2740,21 +2740,25 @@ void AiL::_PrepareLevel(MapName map,MusicChange changeMusic){
//Until the audio has stopped (by waiting for a set amount of time), we will respect the audio engine's wishes and not proceed.
LoadingScreen::DeferLoad([&](){return audioEngine.playBGMWaitTime==0.f;}); //This is the wait time for the audio engine to finish.
#pragma region Audio Channel Loading (Count based on Audio::GetPrepareBGMLoopIterations)
for(int i=0;i<Audio::GetPrepareBGMLoopIterations(MAP_DATA[GetCurrentLevel()].bgmSongName);i++){
LoadingScreen::AddPhase([&](){
Audio::UpdateLoop();
return true;
});
if(MAP_DATA[GetCurrentLevel()].bgmSongName.length()>0){
for(int i=0;i<Audio::GetPrepareBGMLoopIterations(MAP_DATA[GetCurrentLevel()].bgmSongName);i++){
LoadingScreen::AddPhase([&](){
Audio::UpdateLoop();
return true;
});
}
}
#pragma endregion
LoadingScreen::AddPhase([&](){
Audio::BGM&track=audioEngine.bgm[audioEngine.GetTrackName()];
for(int trackID:track.GetChannelIDs()){
audioEngine.Engine().Play(trackID,true);
if(MAP_DATA[GetCurrentLevel()].bgmSongName.length()>0){
Audio::BGM&track=audioEngine.bgm[audioEngine.GetTrackName()];
for(int trackID:track.GetChannelIDs()){
audioEngine.Engine().Play(trackID,true);
}
Audio::muted=false;
Audio::UpdateBGMVolume();
}
Audio::muted=false;
Audio::UpdateBGMVolume();
return true;
});
}

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1
#define VERSION_MINOR 3
#define VERSION_PATCH 0
#define VERSION_BUILD 12248
#define VERSION_BUILD 12250
#define stringify(a) stringify_(a)
#define stringify_(a) #a

28
Adventures in Lestoria/assets/Campaigns/World_Map.tmx
View File

@ -981,7 +981,7 @@
<property name="Connection 4 - West" type="object" value="33"/>
<property name="Map" propertytype="Level" value="NONE"/>
<property name="Type" propertytype="StageType" value="NONE"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_1_3"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_3_2"/>
</properties>
</object>
<object id="52" name="Story IV-I" type="StagePlate" x="565" y="257" width="18" height="22">
@ -989,9 +989,9 @@
<property name="Connection 1 - North" type="object" value="0"/>
<property name="Connection 2 - East" type="object" value="53"/>
<property name="Connection 4 - West" type="object" value="51"/>
<property name="Map" propertytype="Level" value="STORY_2_1"/>
<property name="Map" propertytype="Level" value="STORY_4_1"/>
<property name="Type" propertytype="StageType" value="STORY"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_1_3"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_3_2"/>
</properties>
</object>
<object id="53" name="Stage IV-I" type="StagePlate" x="609" y="253" width="42" height="14">
@ -999,7 +999,7 @@
<property name="Connection 2 - East" type="object" value="55"/>
<property name="Connection 3 - South" type="object" value="0"/>
<property name="Connection 4 - West" type="object" value="52"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_1"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1009,7 +1009,7 @@
<property name="Connection 1 - North" type="object" value="56"/>
<property name="Connection 3 - South" type="object" value="0"/>
<property name="Connection 4 - West" type="object" value="53"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_2"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1019,7 +1019,7 @@
<property name="Connection 1 - North" type="object" value="57"/>
<property name="Connection 3 - South" type="object" value="55"/>
<property name="Connection 4 - West" type="object" value="57"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_3"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1029,7 +1029,7 @@
<property name="Connection 1 - North" type="object" value="58"/>
<property name="Connection 2 - East" type="object" value="58"/>
<property name="Connection 3 - South" type="object" value="56"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_4"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1040,7 +1040,7 @@
<property name="Connection 2 - East" type="object" value="60"/>
<property name="Connection 3 - South" type="object" value="57"/>
<property name="Connection 4 - West" type="object" value="57"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_5"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1049,7 +1049,7 @@
<properties>
<property name="Connection 2 - East" type="object" value="61"/>
<property name="Connection 3 - South" type="object" value="58"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_6"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1059,7 +1059,7 @@
<property name="Connection 2 - East" type="object" value="63"/>
<property name="Connection 3 - South" type="object" value="0"/>
<property name="Connection 4 - West" type="object" value="58"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_B1"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1070,7 +1070,7 @@
<property name="Connection 2 - East" type="object" value="62"/>
<property name="Connection 3 - South" type="object" value="0"/>
<property name="Connection 4 - West" type="object" value="59"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_7"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1081,7 +1081,7 @@
<property name="Connection 2 - East" type="object" value="64"/>
<property name="Connection 3 - South" type="object" value="61"/>
<property name="Connection 4 - West" type="object" value="61"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_3_1"/>
<property name="Map" propertytype="Level" value="CAMPAIGN_4_8"/>
<property name="Type" propertytype="StageType" value="DUNGEON"/>
<property name="Unlock Condition" propertytype="Level" value="WORLD_MAP"/>
</properties>
@ -1089,7 +1089,7 @@
<object id="63" name="Boss B-IV" type="StagePlate" x="845" y="193" width="30" height="22">
<properties>
<property name="Connection 4 - West" type="object" value="60"/>
<property name="Map" propertytype="Level" value="BOSS_3_B"/>
<property name="Map" propertytype="Level" value="BOSS_4_B"/>
<property name="Type" propertytype="StageType" value="BOSS"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_2_1"/>
</properties>
@ -1098,7 +1098,7 @@
<properties>
<property name="Connection 3 - South" type="object" value="62"/>
<property name="Connection 4 - West" type="object" value="62"/>
<property name="Map" propertytype="Level" value="BOSS_3_B"/>
<property name="Map" propertytype="Level" value="BOSS_4"/>
<property name="Type" propertytype="StageType" value="BOSS"/>
<property name="Unlock Condition" propertytype="Level" value="STORY_2_1"/>
</properties>

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.