diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index 3d730564..87c0dbcc 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -53,7 +53,8 @@ "overworld", "foresty_boss", "base_camp", - "mountain" + "mountain", + "mountain_boss" ], "valuesAsFlags": false }, diff --git a/Adventures in Lestoria/TrailEffect.h b/Adventures in Lestoria/TrailEffect.h index a59eb649..c75dda06 100644 --- a/Adventures in Lestoria/TrailEffect.h +++ b/Adventures in Lestoria/TrailEffect.h @@ -60,7 +60,7 @@ struct TrailEffect:Effect{ for(std::shared_ptr&monster:MONSTER_LIST){ vf2d closestPointToFlameTrail{geom2d::closest(geom2d::line{pos,endPos},monster->GetPos())}; float distToTrail{util::distance(monster->GetPos(),closestPointToFlameTrail)}; - if(!monster->InUndamageableState(OnUpperLevel(),GetZ())&&distToTrail<=12*size.y){ + if(!monster->InUndamageableState(OnUpperLevel(),GetZ())&&distToTrail<=24*size.y){ monster->Hurt(damage,OnUpperLevel(),GetZ(),HurtFlag::DOT); SoundEffect::PlaySFX("Burn",monster->GetPos()); } diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 0e5068c3..fb9d58ca 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 11328 +#define VERSION_BUILD 11330 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx index bf651808..8337d898 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_2.tmx @@ -2,7 +2,7 @@ - + diff --git a/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx b/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx index b19bc8a0..82abda9c 100644 --- a/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx +++ b/Adventures in Lestoria/assets/Campaigns/Boss_2_B.tmx @@ -2,7 +2,7 @@ - + diff --git a/Adventures in Lestoria/assets/config/audio/bgm.txt b/Adventures in Lestoria/assets/config/audio/bgm.txt index 6ec2d2fa..b26bac4f 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]=foresty1_1.ogg + channel[0]=foresty_full1.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -62,11 +62,8 @@ BGM Track Name = Foresty Loop 2 channel[0]=loop2/foresty1_1_loop2_bass.ogg - channel[1]=loop2/foresty1_1_loop2_drums.ogg - channel[2]=loop2/foresty1_1_loop2_piano 1.ogg - channel[3]=loop2/foresty1_1_loop2_piano 2.ogg - channel[4]=loop2/foresty1_1_loop2_staccato.ogg - channel[5]=loop2/foresty1_1_loop2_strings.ogg + channel[1]=loop2/foresty1_1_loop2_staccato.ogg + channel[2]=loop2/foresty1_1_loop2_strings.ogg # Transition time between one phase to the next. Fade Time = 2.0 @@ -75,8 +72,8 @@ BGM Events { - Default Volume = 0%,0%,0%,0%,50%,0% - TitleScreenLoaded = 30%,0%,0%,0%,50%,30% + Default Volume = 0%,50%,0% + TitleScreenLoaded = 30%,50%,30% } } @@ -135,7 +132,25 @@ BGM { Track Name = Foresty - channel[0]=AiL_mountain2.ogg + channel[0]=AiL_mountain2_2.ogg + + # Transition time between one phase to the next. + Fade Time = 2.0 + + Loop Repeat Start Point = 0.0s + + Events + { + Default Volume = 70% + } + } + + #Song title followed by filenames for individual parts + mountain_boss + { + Track Name = Mountain Boss + + channel[0]=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 a86da510..d60bfa9c 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_mountain2.ogg b/Adventures in Lestoria/assets/music/AiL_mountain2.ogg deleted file mode 100644 index ab005f83..00000000 Binary files a/Adventures in Lestoria/assets/music/AiL_mountain2.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 new file mode 100644 index 00000000..9f8760ba Binary files /dev/null and b/Adventures in Lestoria/assets/music/AiL_mountain2_2.ogg differ diff --git a/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg b/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg new file mode 100644 index 00000000..3c7b3f4f Binary files /dev/null and b/Adventures in Lestoria/assets/music/AiL_mountain_boss.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty_boss.ogg b/Adventures in Lestoria/assets/music/foresty_boss.ogg index 74db220f..0591e88f 100644 Binary files a/Adventures in Lestoria/assets/music/foresty_boss.ogg and b/Adventures in Lestoria/assets/music/foresty_boss.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty_full1.ogg b/Adventures in Lestoria/assets/music/foresty_full1.ogg new file mode 100644 index 00000000..2e7684f5 Binary files /dev/null and b/Adventures in Lestoria/assets/music/foresty_full1.ogg differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index dd57f77c..1baac386 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ