Tweak and fix Falling Bullet behavior to use proper coloring. Release Build 11958.

Adventures in Lestoria/BulletTypes.h

@@ -283,7 +283,7 @@ private:
 
 struct FallingBullet:public Bullet{
 	//The position for this bullet represents where the falling bullet should land.
-	FallingBullet(const std::string&imgName,vf2d targetPos,vf2d vel,float zVel,float indicatorDisplayTime,float radius,int damage,bool upperLevel,bool hitsMultiple=false,float knockbackAmt=0.f,float lifetime=INFINITE,bool friendly=false,Pixel col=WHITE,vf2d scale={1,1},float image_angle=0.f,float spellCircleRotation=0.f,float spellCircleRotationSpd=0.f,Pixel insigniaCol=WHITE,float insigniaRotation=0.f,float insigniaRotationSpd=0.f);
+	FallingBullet(const std::string&imgName,vf2d targetPos,vf2d vel,float zVel,float indicatorDisplayTime,float radius,int damage,bool upperLevel,bool hitsMultiple=false,float knockbackAmt=0.f,float lifetime=INFINITE,bool friendly=false,Pixel spellCircleCol=WHITE,vf2d scale={1,1},float image_angle=0.f,float spellCircleRotation=0.f,float spellCircleRotationSpd=0.f,Pixel insigniaCol=WHITE,float insigniaRotation=0.f,float insigniaRotationSpd=0.f);
 protected:
 	void Update(float fElapsedTime)override;
 	void Draw(const Pixel blendCol)const override;

Adventures in Lestoria/FallingBullet.cpp

@@ -45,9 +45,9 @@ All rights reserved.
 
 INCLUDE_game
 
-FallingBullet::FallingBullet(const std::string&imgName,vf2d targetPos,vf2d vel,float zVel,float indicatorDisplayTime,float radius,int damage,bool upperLevel,bool hitsMultiple,float knockbackAmt,float lifetime,bool friendly,Pixel col,vf2d scale,float image_angle,float spellCircleRotation,float spellCircleRotationSpd,Pixel insigniaCol,float insigniaRotation,float insigniaRotationSpd)
-:Bullet(targetPos,vel,radius,damage,imgName,upperLevel,false,lifetime+0.1f,false,friendly,col,scale,image_angle),targetPos(targetPos),zVel(zVel),indicatorDisplayTime(indicatorDisplayTime),knockbackAmt(knockbackAmt),
-indicator(targetPos,lifetime+0.1f,"range_indicator.png","spell_insignia.png",upperLevel,radius/12.f,0.5f,{},col,spellCircleRotation,spellCircleRotationSpd,false,radius/12.f,0.f,{},insigniaCol,insigniaRotation,insigniaRotationSpd,false){
+FallingBullet::FallingBullet(const std::string&imgName,vf2d targetPos,vf2d vel,float zVel,float indicatorDisplayTime,float radius,int damage,bool upperLevel,bool hitsMultiple,float knockbackAmt,float lifetime,bool friendly,Pixel spellCircleCol,vf2d scale,float image_angle,float spellCircleRotation,float spellCircleRotationSpd,Pixel insigniaCol,float insigniaRotation,float insigniaRotationSpd)
+:Bullet(targetPos,vel,radius,damage,imgName,upperLevel,false,lifetime+0.1f,false,friendly,WHITE,scale,image_angle),targetPos(targetPos),zVel(zVel),indicatorDisplayTime(indicatorDisplayTime),knockbackAmt(knockbackAmt),
+indicator(targetPos,lifetime+0.1f,"range_indicator.png","spell_insignia.png",upperLevel,radius/12.f,0.5f,{},spellCircleCol,spellCircleRotation,spellCircleRotationSpd,false,radius/12.f,0.f,{},insigniaCol,insigniaRotation,insigniaRotationSpd,false){
 	pos+=-vel*lifetime;
 	z=-zVel*lifetime;
 }
@@ -62,16 +62,16 @@ void FallingBullet::Update(float fElapsedTime){
 			fadeOutTime=0.5f;
 			SoundEffect::PlaySFX("Stone Land",pos);
 			if(friendly){
-				for(auto&[monsterPtr,hurt]:game->Hurt(targetPos,radius,damage,OnUpperLevel(),z,HurtType::MONSTER)){
+				for(auto&[monsterPtr,hurt]:game->Hurt(pos,radius,damage,OnUpperLevel(),z,HurtType::MONSTER)){
 					if(hurt)std::get<Monster*>(monsterPtr)->ApplyIframes(0.1f);
 				}
 			}
 			else{
-				for(auto&[playerPtr,hurt]:game->Hurt(targetPos,radius,damage,OnUpperLevel(),z,HurtType::PLAYER)){
+				for(auto&[playerPtr,hurt]:game->Hurt(pos,radius,damage,OnUpperLevel(),z,HurtType::PLAYER)){
 					if(hurt)std::get<Player*>(playerPtr)->ApplyIframes(0.1f);
 				}
 			}
-			game->ProximityKnockback(targetPos,radius,knockbackAmt,HurtType::PLAYER|HurtType::MONSTER);
+			game->ProximityKnockback(pos,radius,knockbackAmt,HurtType::PLAYER|HurtType::MONSTER);
 			for(int i:std::ranges::iota_view(0,30))game->AddEffect(std::make_unique<Effect>(pos-vf2d{0.f,GetZ()},util::random_range(0.05f,0.2f),"circle_outline.png",OnUpperLevel(),util::random_range(0.5f,1.f),0.2f,vf2d{util::random_range(-10.f,10.f),util::random_range(-3.f,0.f)},PixelLerp(BLACK,col,util::random(1.f)),0.f,0.f,true));
 			Deactivate();
 		}

Adventures in Lestoria/GhostOfPirateCaptain.cpp

@@ -65,7 +65,7 @@ void Monster::STRATEGY::GHOST_OF_PIRATE_CAPTAIN(Monster&m,float fElapsedTime,std
 
 	const auto AdvanceCannonPhase{[&m,&strategy](){
 		m.GetFloat(A::CANNON_TIMER)=0.f;
-		if(m.GetInt(A::CANNON_PHASE)+1>=PHASE_COUNT)m.GetInt(A::CANNON_SHOT_TYPE)=util::random()%5;
+		//if(m.GetInt(A::CANNON_PHASE)+1>=PHASE_COUNT)m.GetInt(A::CANNON_SHOT_TYPE)=util::random()%5;
 		m.GetInt(A::CANNON_PHASE)=(m.GetInt(A::CANNON_PHASE)+1)%PHASE_COUNT;
 	}};
 
@@ -93,7 +93,7 @@ void Monster::STRATEGY::GHOST_OF_PIRATE_CAPTAIN(Monster&m,float fElapsedTime,std
 								const float randomAng{util::random_range(0,2*PI)};
 								const float range{util::random_range(0,ConfigPixels("Bombardment Max Distance"))};
 								const vf2d targetPos{game->camera.GetTarget()-ConfigPixels("Bombardment Max Distance")/2.f+vf2d{range,randomAng}.cart()};
-								CreateBullet(FallingBullet)("cannonball.png",targetPos,ConfigVec("Cannon Vel"),ConfigFloatArr("Cannon Vel",2),ConfigFloat("Indicator Time"),ConfigPixels("Cannon Radius"),ConfigInt("Cannon Damage"),m.OnUpperLevel(),false,ConfigFloat("Cannon Knockback Amt"),0.4f,false,ConfigPixel("Cannon Spell Circle Color"),vf2d{ConfigFloat("Cannon Radius")/100.f*2.f,ConfigFloat("Cannon Radius")/100.f*2.f},util::random(2*PI),util::random(2*PI),util::degToRad(ConfigFloat("Cannon Spell Circle Rotation Spd")),ConfigPixel("Cannon Spell Insignia Color"),util::random(2*PI),util::degToRad(ConfigFloat("Cannon Spell Insignia Rotation Spd")))EndBullet;
+								CreateBullet(FallingBullet)("cannonball.png",targetPos,ConfigVec("Cannon Vel"),ConfigFloatArr("Cannon Vel",2),ConfigFloat("Indicator Time"),ConfigPixels("Cannon Radius"),ConfigInt("Cannon Damage"),m.OnUpperLevel(),false,ConfigFloat("Cannon Knockback Amt"),ConfigFloat("Cannon Shot Impact Time"),false,ConfigPixel("Cannon Spell Circle Color"),vf2d{ConfigFloat("Cannon Radius")/100.f*1.75f,ConfigFloat("Cannon Radius")/100.f*1.75f},util::random(2*PI),util::random(2*PI),util::degToRad(ConfigFloat("Cannon Spell Circle Rotation Spd")),ConfigPixel("Cannon Spell Insignia Color"),util::random(2*PI),util::degToRad(ConfigFloat("Cannon Spell Insignia Rotation Spd")))EndBullet;
 							}break;
 							case PRECISE_BOMBARDMENT:{
 

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 11946
+#define VERSION_BUILD 11958
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Adventures in Lestoria/assets/config/MonsterStrategies.txt

@@ -1304,17 +1304,19 @@ MonsterStrategy
 		# Repeats at end of cycle.
 		Cannon Cycle = 0,0,0,0,0,0,0,0,1,2,1
 
-		Cannon Shot Delay = 2.5s
+		Cannon Shot Delay = 0.4s
+		Cannon Shot Impact Time = 2.5s
 		Silence Time = 2s
-		Shrapnel Shot Delay = 2.5s
+		Shrapnel Shot Delay = 0.4s
+		Sharpnel Shot Impact Time = 2.5s
 
 		Bombardment Max Distance = 900
 		Precise Bombardment Max Distance = 700
 		
 		# Provide an X,Y,Z falling velocity
-		Cannon Vel = -40.0, 0.0, -250.0
+		Cannon Vel = -50.0, 0.0, -400.0
 		# How long the indicator will appear before the cannon drops down.
-		Indicator Time = 1s
+		Indicator Time = 2.5s
 		Cannon Radius = 175
 		Cannon Damage = 80
 		Cannon Knockback Amt = 200