Removed ability for flags to buff themselves. Flags spawn in the air and fall. Added Chapter 4 stage music to stages. Rwelease Build 12388.

2026-02-02 15:32:37 -06:00 · 2026-02-02 15:32:37 -06:00 · f4fcb3893a
commit f4fcb3893a
parent 9d38fbeada
19 changed files with 42 additions and 16 deletions
--- a/Lestoria.tiled-project
+++ b/Lestoria.tiled-project
@ -74,7 +74,8 @@
                "mountain",
                "mountain_boss",
                "beach",
-                "beach_boss"
+                "beach_boss",
+                "undead_swamp"
            ],
            "valuesAsFlags": false
        },
--- a/Lestoria/AdventuresInLestoria.cpp
+++ b/Lestoria/AdventuresInLestoria.cpp
@ -3405,6 +3405,7 @@ void AiL::InitializeLevels(){

 Monster&AiL::SpawnMonster(vf2d pos,MonsterData&data,bool upperLevel,bool isBossSpawn){
 	std::shared_ptr<Monster>newMonster{monstersToBeSpawned.emplace_back(std::make_shared<Monster>(pos,data,upperLevel,isBossSpawn))};
+	newMonster->weakPtr=newMonster;
 	if(isBossSpawn){
 		totalBossEncounterMobs++;
 	}
@ -4402,7 +4403,6 @@ void AiL::UpdateMonsters(){
 	}
 	for(std::shared_ptr<Monster>&m:game->monstersToBeSpawned){
 		size_t prevCapacity=MONSTER_LIST.capacity();
-		m->weakPtr=m;
 		MONSTER_LIST.emplace_back(std::move(m));
 		if(MONSTER_LIST.capacity()>prevCapacity)LOG(std::format("WARNING! The monster list has automatically reserved more space and resized to {}! This caused one potential frame where bullet/effect hitlists that stored information on what monsters were hit to potentially be hit a second time or cause monsters that should've been hit to never be hit. Consider starting with a larger default reserved size for MONSTER_LIST if your intention was to have this many monsters!",MONSTER_LIST.capacity()));
 	}
--- a/Lestoria/SkeletonCaptain.cpp
+++ b/Lestoria/SkeletonCaptain.cpp
@ -56,11 +56,13 @@ void Monster::STRATEGY::SKELETON_CAPTAIN(Monster&m,float fElapsedTime,std::strin

 	if(PHASE()!=INITIAL){
 		m.F(A::ATTACK_COOLDOWN)=std::max(0.f,m.F(A::ATTACK_COOLDOWN)-fElapsedTime);
-		const Monster*flag=any_cast<Monster*>(m.ANY(A::FLAG_PTR));
-		if(m.F(A::ATTACK_COOLDOWN)<=0.f&&(!flag||flag->IsDead())){
+		std::weak_ptr<Monster>flag=any_cast<std::weak_ptr<Monster>>(m.ANY(A::FLAG_PTR));
+		if(m.F(A::ATTACK_COOLDOWN)<=0.f&&(flag.expired()||flag.lock()->IsDead())){
 			for(std::shared_ptr<Monster>&flagTarget:MONSTER_LIST|std::views::filter([&m,&strategy](std::shared_ptr<Monster>&monster){return m.GetDistanceFrom(monster->GetPos())<=ConfigFloat("Drop Flag Range")/100.f*24;})){
 				m.F(A::ATTACK_COOLDOWN)=ConfigFloat("Flag Cooldown Time");
-				m.ANY(A::FLAG_PTR)=&game->SpawnMonster(flagTarget->GetPos(),MONSTER_DATA.at("Skeleton Captain Flag"),m.OnUpperLevel());
+				m.ANY(A::FLAG_PTR)=game->SpawnMonster(flagTarget->GetPos(),MONSTER_DATA.at("Skeleton Captain Flag"),m.OnUpperLevel()).GetWeakPointer();
+				std::weak_ptr<Monster>newFlag=any_cast<std::weak_ptr<Monster>>(m.ANY(A::FLAG_PTR));
+				newFlag.lock()->SetZ(60.f);
 				break;
 			}
 		}
@ -68,8 +70,7 @@ void Monster::STRATEGY::SKELETON_CAPTAIN(Monster&m,float fElapsedTime,std::strin

 	switch(PHASE()){
 		case INITIAL:{
-			Monster*blank{nullptr};
-			m.ANY(A::FLAG_PTR)=blank;
+			m.ANY(A::FLAG_PTR)=std::weak_ptr<Monster>{};
 			SETPHASE(RESET);
 		}break;
 		case RESET:{
--- a/Lestoria/SkeletonCaptainFlag.cpp
+++ b/Lestoria/SkeletonCaptainFlag.cpp
@ -47,12 +47,12 @@ using A=Attribute;
 void Monster::STRATEGY::SKELETON_CAPTAIN_FLAG(Monster&m,float fElapsedTime,std::string strategy){
 	const float HASTE_REAPPLY_TIME=1.f;

-	if(m.GetZ()>0)m.SetZ(std::max(0.f,m.GetZ()-60.f*fElapsedTime));
+	if(m.GetZ()>0)m.SetZ(std::max(0.f,m.GetZ()-120.f*fElapsedTime));

 	m.F(A::ATTACK_COOLDOWN)-=fElapsedTime;
 	if(m.F(A::ATTACK_COOLDOWN)<=0.f){
 		m.F(A::ATTACK_COOLDOWN)=HASTE_REAPPLY_TIME;
-		for(std::shared_ptr<Monster>&target:MONSTER_LIST|std::views::filter([](std::shared_ptr<Monster>&m){return m->IsAlive()&&!m->isBoss&&m->GetStrategyName()!="Skeleton Captain";})){
+		for(std::shared_ptr<Monster>&target:MONSTER_LIST|std::views::filter([](std::shared_ptr<Monster>&m){return m->IsAlive()&&!m->isBoss&&m->GetStrategyName()!="Skeleton Captain"&&m->GetStrategyName()!="Skeleton Captain Flag";;})){
 			if(target->GetDistanceFrom(m.GetPos())<=ConfigFloat("Haste Buff Range")/100.f*24)target->AddBuff(BuffType::HASTEN,HASTE_REAPPLY_TIME,ConfigFloat("Haste Buff")/100.f);
 		}
 	}
--- a/Lestoria/TODO.txt
+++ b/Lestoria/TODO.txt
@ -18,9 +18,6 @@ Cherry pick f398adcde6bb5f8c3c0581f13f18e73d4417a46c from ConnectionPointFixes
 Cherry pick fb5a72267c5db89b7333287e12f05b614b71c23b from MiscFixes
 Cherry pick 6355054d6c8e76c6aa4b18760a293e3d1a020752 from master

-Remove curse debuff on boss kill
-Shrapnel shots not occurring on final phase?
-
 DEMO
 ====

--- a/Lestoria/Version.h
+++ b/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 12382
+#define VERSION_BUILD 12388

 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
--- a/Lestoria/assets/Campaigns/4_1.tmx
+++ b/Lestoria/assets/Campaigns/4_1.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="315" height="238" tilewidth="24" tileheight="24" infinite="0" nextlayerid="7" nextobjectid="15">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
@ -185,8 +186,8 @@
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2663,2767,2767,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2326,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2325,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2767,2715,2664,2709,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2768,2715,2767,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2326,2376,2767,2768,2768,2663,2664,2664,2767,2664,2663,2664,2374,2375,2375,2325,2874,2874,2874,2874,2874,2874,2326,2375,2375,2375,2375,2375,2375,2325,2874,2874,2874,2874,2874,2326,2375,2375,2375,2375,2375,2325,2874,2874,2874,2874,2323,2323,2326,2375,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2323,2324,2768,2767,2715,2709,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2715,2715,2870,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2326,2375,2375,2375,2375,2376,2664,2716,2663,2716,2767,2716,2664,2664,2663,2663,2716,2716,2663,2768,2374,2375,2375,2375,2375,2375,2375,2376,2663,2715,2767,2716,2768,2664,2374,2375,2375,2375,2375,2375,2376,2715,2664,2767,2716,2767,2374,2375,2325,2874,2874,2323,2375,2376,2716,2767,2663,2663,2768,2663,2715,2374,2325,2323,2323,2326,2375,2375,2375,2375,2375,2375,2375,2376,2374,2375,2375,2375,2375,2375,2325,2323,2326,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2375,2375,2375,2376,2716,2767,2663,2768,2663,2715,2374,2325,2323,2323,2326,2375,2375,2375,2375,2375,2375,2375,2376,2374,2375,2375,2375,2375,2375,2325,2323,2326,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2375,2375,2375,2376,2716,2767,2663,2768,2663,2715,2374,2325,2323,2323,2326,2375,2375,2375,2375,2375,2375,2375,2376,2374,2375,2375,2375,2375,2375,2325,2323,2326,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2375,2325,2323,2323,2323,2323,2323,2323,2323,2323,2323,2326,2375,2375,2376,2767,2657,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
-2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2663,2768,2270,2273,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2767,2715,2715,2716,2663,2664,2768,2716,2767,2767,2663,2663,2768,2663,2664,2716,2767,2715,2767,2768,2767,2768,2767,2664,2715,2716,2767,2716,2768,2715,2664,2768,2768,2768,2767,2663,2664,2664,2715,2716,2664,2663,2715,2767,2767,2715,2768,2322,2874,2874,2323,2274,2272,2767,2657,2658,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2716,2768,2664,2768,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2716,2768,2664,2768,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2664,2657,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
-2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2768,2715,2374,2325,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2716,2664,2663,2663,2715,2664,2716,2715,2768,2768,2663,2768,2768,2768,2664,2768,2715,2716,2664,2715,2663,2767,2715,2716,2664,2663,2663,2767,2768,2767,2715,2768,2767,2663,2664,2716,2715,2664,2768,2767,2663,2716,2716,2768,2716,2767,2715,2322,2874,2874,2323,2323,2324,2664,2709,2710,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2664,2715,2657,2658,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2664,2715,2657,2658,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2768,2709,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
+2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2663,2768,2270,2273,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2767,2715,2715,2716,2663,2664,2768,2716,2767,2767,2663,2663,2768,2663,2664,2716,2767,2715,2767,2768,2767,2768,2767,2664,2715,2716,2767,2716,2768,2715,2664,2768,2768,2768,2767,2663,2664,2664,2715,2716,2664,2663,2715,2767,2767,2715,2768,2322,2874,2874,2323,2274,2272,2767,2657,2659,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2716,2768,2664,2768,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2716,2768,2664,2768,2715,2664,2715,2716,2768,2374,2375,2375,2376,2664,2767,2767,2767,2768,2768,2768,2664,2716,2715,2767,2716,2664,2663,2374,2375,2376,2715,2663,2767,2768,2715,2715,2767,2716,2716,2767,2768,2374,2375,2375,2375,2375,2375,2325,2326,2375,2375,2376,2664,2715,2664,2657,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
+2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2768,2715,2374,2325,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2716,2664,2663,2663,2715,2664,2716,2715,2768,2768,2663,2768,2768,2768,2664,2768,2715,2716,2664,2715,2663,2767,2715,2716,2664,2663,2663,2767,2768,2767,2715,2768,2767,2663,2664,2716,2715,2664,2768,2767,2663,2716,2716,2768,2716,2767,2715,2322,2874,2874,2323,2323,2324,2664,2709,2661,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2664,2715,2657,2658,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2664,2715,2657,2658,2658,2658,2659,2715,2716,2716,2716,2715,2767,2768,2768,2767,2767,2657,2658,2658,2658,2658,2658,2658,2659,2663,2663,2768,2664,2767,2767,2664,2657,2658,2658,2658,2658,2658,2659,2768,2768,2715,2768,2767,2716,2664,2716,2374,2376,2716,2715,2768,2716,2768,2768,2709,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2767,2715,2664,2322,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2767,2715,2716,2716,2767,2664,2715,2664,2715,2768,2768,2715,2663,2716,2768,2768,2768,2767,2767,2768,2767,2664,2664,2663,2768,2768,2664,2715,2715,2716,2767,2716,2663,2768,2664,2716,2767,2716,2715,2663,2767,2663,2664,2663,2767,2664,2663,2322,2874,2874,2323,2323,2324,2767,2709,2710,2710,2710,2661,2659,2715,2664,2767,2657,2658,2658,2658,2659,2768,2709,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2658,2660,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2659,2664,2767,2768,2657,2658,2658,2658,2658,2658,2658,2660,2710,2710,2710,2661,2659,2715,2664,2767,2657,2658,2658,2658,2659,2768,2709,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2658,2660,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2659,2664,2767,2768,2657,2658,2658,2658,2658,2658,2658,2660,2710,2710,2710,2661,2659,2715,2664,2767,2657,2658,2658,2658,2659,2768,2709,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2658,2660,2710,2710,2710,2710,2710,2661,2658,2658,2658,2658,2658,2658,2659,2664,2767,2768,2657,2658,2658,2658,2658,2659,2761,2712,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2767,2716,2715,2322,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2326,2376,2664,2716,2716,2716,2716,2664,2663,2716,2664,2663,2664,2715,2767,2767,2768,2768,2664,2768,2767,2767,2663,2768,2664,2767,2663,2716,2715,2663,2664,2663,2768,2768,2664,2664,2715,2715,2664,2664,2768,2664,2716,2663,2716,2715,2663,2767,2664,2322,2874,2874,2323,2323,2324,2663,2761,2712,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2661,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2661,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2661,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2661,2658,2658,2658,2660,2710,2710,2710,2710,2661,2658,2660,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
 2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2711,2663,2715,2663,2322,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2874,2324,2716,2715,2768,2716,2664,2664,2715,2663,2767,2716,2663,2715,2716,2716,2663,2767,2663,2715,2768,2716,2715,2663,2663,2716,2767,2715,2664,2716,2663,2270,2271,2271,2271,2271,2271,2272,2663,2767,2663,2715,2767,2715,2715,2767,2715,2664,2767,2663,2322,2874,2874,2323,2323,2324,2767,2716,2761,2712,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,2710,
--- a/Lestoria/assets/Campaigns/4_2.tmx
+++ b/Lestoria/assets/Campaigns/4_2.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="206" height="288" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
--- a/Lestoria/assets/Campaigns/4_3.tmx
+++ b/Lestoria/assets/Campaigns/4_3.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="206" height="338" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>
--- a/Lestoria/assets/Campaigns/4_4.tmx
+++ b/Lestoria/assets/Campaigns/4_4.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="315" height="338" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
--- a/Lestoria/assets/Campaigns/4_5.tmx
+++ b/Lestoria/assets/Campaigns/4_5.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="314" height="438" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Chapter_4_Ground.tsx"/>
--- a/Lestoria/assets/Campaigns/4_6.tmx
+++ b/Lestoria/assets/Campaigns/4_6.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="260" height="288" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Chapter_4_Details.tsx"/>
--- a/Lestoria/assets/Campaigns/4_7.tmx
+++ b/Lestoria/assets/Campaigns/4_7.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="368" height="288" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Chapter_4_Ground.tsx"/>
--- a/Lestoria/assets/Campaigns/4_8.tmx
+++ b/Lestoria/assets/Campaigns/4_8.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="314" height="238" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Chapter_4_Objects_24x24.tsx"/>
--- a/Lestoria/assets/Campaigns/4_B1.tmx
+++ b/Lestoria/assets/Campaigns/4_B1.tmx
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="260" height="288" tilewidth="24" tileheight="24" infinite="0" nextlayerid="5" nextobjectid="1">
 <properties>
+  <property name="Background Music" propertytype="BGM" value="undead_swamp"/>
  <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
 </properties>
 <tileset firstgid="1" source="../maps/Decorations_c1_No_Shadow24x24.tsx"/>
--- a/Lestoria/assets/config/audio/bgm.txt
+++ b/Lestoria/assets/config/audio/bgm.txt
@ -206,4 +206,22 @@ BGM
 			Default Volume = 70%
 		}
 	}
+
+	#Song title followed by filenames for individual parts
+	undead_swamp
+	{
+		Track Name = Undead Swamp
+
+		channel[0]=commercial_assets/AiL_undeadSwamp.ogg
+
+		# Transition time between one phase to the next.
+		Fade Time = 2.0
+
+		Loop Repeat Start Point = 0.0s
+
+		Events
+		{
+			Default Volume = 70%
+		}
+	}
 }
--- a/Lestoria/assets/gamepack.pak
+++ b/Lestoria/assets/gamepack.pak
--- a/distribute.ps1
+++ b/distribute.ps1
@ -2,7 +2,7 @@ git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 rm -R bin
 mkdir bin
 mkdir bin/assets
-$ErrorActionPreference = "Stop"
+
 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
--- a/x64/Release/Adventures
+++ b/x64/Release/Adventures