Merge pull request 'Remove curse debuff when player completes Chapter 3 final boss fight. Shrapnel shots now appear again during the final phase. Release Build 12367.' (#106) from GhostOfPirateCaptain into master

Reviewed-on: #106

Adventures in Lestoria/GhostOfPirateCaptain.cpp

@@ -326,9 +326,11 @@ void Monster::STRATEGY::GHOST_OF_PIRATE_CAPTAIN(Monster&m,float fElapsedTime,std
 				m.B(A::IGNORE_DEFAULT_ANIMATIONS)=true;
 				RUN_TOWARDS(m,game->GetElapsedTime(),"Run Towards");
 				m.PerformAnimation("DEATH");
+				game->GetPlayer()->RemoveAllBuffs(BuffType::PIRATE_GHOST_CAPTAIN_CURSE_DOT);
 				return true;
 			});
 			m.F(A::CANNON_TIMER)+=fElapsedTime;
+			m.F(A::SHRAPNEL_CANNON_TIMER)+=fElapsedTime;
 			if(m.F(A::CANNON_TIMER)>=ConfigFloat("Final Cannon Shot Delay")){
 				switch(m.I(A::CANNON_SHOT_TYPE)){
 					case BOMBARDMENT:{
@@ -365,7 +367,7 @@ void Monster::STRATEGY::GHOST_OF_PIRATE_CAPTAIN(Monster&m,float fElapsedTime,std
 			if(m.F(A::SHRAPNEL_CANNON_TIMER)>=ConfigFloat("Final Shrapnel Timer")){
 				m.I(A::SHRAPNEL_SHOT_COUNT)=ConfigInt("Shrapnel Shot Bullet Count");
 				m.F(A::SHRAPNEL_SHOT_FALL_TIMER)=ConfigFloat("Shrapnel Shot Bullet Separation");
-				m.F(A::SHRAPNEL_CANNON_TIMER)=0.f+util::random(0.5f); // A little randomness to offset the two timers if they happen to occur at once.
+				m.F(A::SHRAPNEL_CANNON_TIMER)=util::random(0.5f); // A little randomness to offset the two timers if they happen to occur at once.
 			}
 		}break;
 	}

Adventures in Lestoria/TODO.txt

@@ -18,9 +18,8 @@ Cherry pick f398adcde6bb5f8c3c0581f13f18e73d4417a46c from ConnectionPointFixes
 Cherry pick fb5a72267c5db89b7333287e12f05b614b71c23b from MiscFixes
 Cherry pick 6355054d6c8e76c6aa4b18760a293e3d1a020752 from master
 
-Remove coin toss for final phase
-Issues with cannon fire in the final phase
-Rebalance final phase ghost sabers
+Remove curse debuff on boss kill
+Shrapnel shots not occurring on final phase?
 
 DEMO
 ====

Adventures in 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 12364
+#define VERSION_BUILD 12367
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a