Bug fixes

NearHuscarl · NearHuscarl · commit d53bf08a9b10 · 2019-01-23T00:31:22.000+07:00
- Fix player dying animation make the camera glitching
- Fix water effect not spawning when player and fishmen
    fall from the far right side of underground map
- Fix add-time-bonus sound effect glitching
- Fix fireballs sometimes hit simon (false positive) when she's
    standing on the higher platform in underground (hopefully)
diff --git a/src/GameCuaTao/Castlevania/Content/Sounds/SoundEffects/Getting_Heart_Bonus.wav b/src/GameCuaTao/Castlevania/Content/Sounds/SoundEffects/Getting_Heart_Bonus.wav
diff --git a/src/GameCuaTao/Castlevania/Content/TiledMaps/Stage_01/Underground.tmx b/src/GameCuaTao/Castlevania/Content/TiledMaps/Stage_01/Underground.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="16" height="6" tilewidth="64" tileheight="64" infinite="0" nextlayerid="11" nextobjectid="43">
+<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="16" height="6" tilewidth="64" tileheight="64" infinite="0" nextlayerid="11" nextobjectid="45">
  <tileset firstgid="1" source="../Candle.tsx"/>
  <tileset firstgid="3" source="../Simon.tsx"/>
  <tileset firstgid="75" source="../Static_Objects.tsx"/>
@@ -83,8 +83,10 @@
     <property name="Item" value="BlueMoneyBag"/>
    </properties>
   </object>
-  <object id="41" name="WaterArea" type="WaterArea" gid="85" x="384" y="365" width="192" height="73"/>
-  <object id="42" name="WaterArea" type="WaterArea" gid="85" x="512" y="365" width="192" height="73"/>
+  <object id="41" name="WaterArea" type="WaterArea" gid="85" x="384" y="365" width="192" height="43"/>
+  <object id="42" name="WaterArea" type="WaterArea" gid="85" x="512" y="365" width="192" height="43"/>
+  <object id="43" name="WaterArea" type="WaterArea" gid="85" x="704" y="365" width="192" height="43"/>
+  <object id="44" name="WaterArea" type="WaterArea" gid="85" x="960" y="365" width="192" height="43"/>
  </objectgroup>
  <objectgroup color="#55ff7f" id="8" name="Foregrounds">
   <object id="39" name="Block" type="BrickBlock" gid="81" x="672" y="192" width="32" height="32"/>
diff --git a/src/GameCuaTao/Castlevania/Content/TiledMaps/Stage_01/Water_Area.png b/src/GameCuaTao/Castlevania/Content/TiledMaps/Stage_01/Water_Area.png
diff --git a/src/GameCuaTao/Castlevania/Content/TiledMaps/Static_Objects.tsx b/src/GameCuaTao/Castlevania/Content/TiledMaps/Static_Objects.tsx
@@ -31,6 +31,6 @@
    <image source="../Misc/Cloud.png" width="64" height="28"/>
   </tile>
   <tile id="10">
-   <image source="Stage_01/Water_Area.png" width="192" height="73"/>
+   <image source="Stage_01/Water_Area.png" width="192" height="43"/>
   </tile>
 </tileset>
diff --git a/src/GameCuaTao/Castlevania/Content/Weapons/Fireball.atlas.xml b/src/GameCuaTao/Castlevania/Content/Weapons/Fireball.atlas.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<GameContent>
+
+  <Spritesheet TexturePath="Fireball.png">
+    <Sprite ID="fire_ball">
+      <SpriteFrame Left="0" Top="0" Width="15" Height="11" />
+      <SpriteBoundary Left="0" Top="10" Width="15" Height="1" />
+    </Sprite>
+  </Spritesheet>
+
+</GameContent>
diff --git a/src/GameCuaTao/Castlevania/Models/Characters/Enemies/Fishman.cpp b/src/GameCuaTao/Castlevania/Models/Characters/Enemies/Fishman.cpp
@@ -29,7 +29,10 @@ void Fishman::Update(UpdateData &updateData)
 
 	if (updateData.isStopwatchActive)
 		if (renderingSystem != nullptr && fishmanState == FishmanState::LAUNCHING)
+		{
 			renderingSystem->Update(updateData.gameTime); // Update launching effect
+			return;
+		}
 
 	switch (fishmanState)
 	{
diff --git a/src/GameCuaTao/Castlevania/Models/Characters/Enemies/GiantBat.cpp b/src/GameCuaTao/Castlevania/Models/Characters/Enemies/GiantBat.cpp
@@ -98,6 +98,9 @@ GiantBatState GiantBat::GetGiantBatState()
 void GiantBat::Update(UpdateData &updateData)
 {
 	Enemy::Update(updateData);
+	
+	if (updateData.isStopwatchActive)
+		return;
 
 	switch (giantBatState)
 	{
diff --git a/src/GameCuaTao/Castlevania/Models/Characters/Player/Player.h b/src/GameCuaTao/Castlevania/Models/Characters/Player/Player.h
@@ -153,7 +153,7 @@ namespace Castlevania
 		Stopwatch throwingCooldownTimer;
 		Stopwatch invisibleTimer;
 
-		// Component-related flags
+		// Component-related members
 		NearbyObjects nearbyObjects;
 
 		// Need a reference to the height of the platform the player was standing before jumping
diff --git a/src/GameCuaTao/Castlevania/Models/Characters/Player/PlayerResponseSystem.cpp b/src/GameCuaTao/Castlevania/Models/Characters/Player/PlayerResponseSystem.cpp
@@ -508,8 +508,13 @@ void PlayerResponseSystem::OnCollideWithStairDownTrigger(Trigger &trigger)
 
 void PlayerResponseSystem::OnCollideWithNextMapTrigger(Trigger &trigger)
 {
-	parent.Notify(NEXT_MAP_CUTSCENE_STARTED);
-	trigger.GetBody().Enabled(false);
+	// Fix an edge case where player just jumps and collides with the next map trigger in
+	// underground map (should trigger when walking up/down stairs and on ground only)
+	if (!parent.IsOnTheAir())
+	{
+		parent.Notify(NEXT_MAP_CUTSCENE_STARTED);
+		trigger.GetBody().Enabled(false);
+	}
 }
 
 void PlayerResponseSystem::OnCollideWithMoneyBagTrigger(Trigger &trigger)
diff --git a/src/GameCuaTao/Castlevania/Models/Factories/ObjectFactory.cpp b/src/GameCuaTao/Castlevania/Models/Factories/ObjectFactory.cpp
@@ -558,11 +558,13 @@ std::unique_ptr<RangedWeapon> ObjectFactory::CreateFireball(Vector2 position)
 {
 	auto object = std::make_unique<RangedWeapon>(ObjectId::Fireball);
 	auto stats = content.Load<Dictionary>("GameStats/Weapons/Fireball.xml");
-
 	ReadSubWeaponConfig(*object.get(), *stats);
 
 	auto movementSystem = std::make_unique<SimpleMovementSystem>(*object);
-	auto renderingSystem = std::make_unique<ItemRenderingSystem>(*object, "Weapons/Fireball.png",
+
+	auto spritesheet = content.Load<Spritesheet>("Weapons/Fireball.atlas.xml");
+	auto textureRegion = spritesheet->begin()->second;
+	auto renderingSystem = std::make_unique<ItemRenderingSystem>(*object, textureRegion,
 		effectFactory->CreateFlameEffect(),
 		effectFactory->CreateSparkEffect());
 
diff --git a/src/GameCuaTao/Castlevania/Scenes/Stages/LevelCompletedCutscene.cpp b/src/GameCuaTao/Castlevania/Scenes/Stages/LevelCompletedCutscene.cpp
@@ -8,9 +8,10 @@ using namespace Castlevania;
 
 constexpr auto CRYSTAL_BALL_HOVERING_TRANSITION_TIME = 1000;
 constexpr auto CONVERTING_TIME_REMAINING_TO_EXP_TRANSITION_TIME = 500;
+constexpr auto CONVERTING_TIME_REMAINING_TO_EXP_SOUND_EFFECT_UPDATE_TIME = 130;
 constexpr auto CONVERTING_HEART_TO_EXP_TRANSITION_TIME = 1000;
 constexpr auto TIME_TO_EXP_UPDATE_TIME = 20;
-constexpr auto HEART_TO_EXP_UPDATE_TIME = 100;
+constexpr auto HEART_TO_EXP_UPDATE_TIME = 130;
 
 enum class LevelCompletedCutscene::State
 {
@@ -60,25 +61,30 @@ void LevelCompletedCutscene::Update(UpdateData &updateData)
 			break;
 
 		case State::CRYSTAL_BALL_ON_GROUND:
-			stage.UpdateGameplay(updateData);
-
 			// check if crystalBall not point to garbage. kinda hacky but works
 			if (crystalBall->GetId() == ObjectId::CrystalBall && crystalBall->GetState() != ObjectState::DEAD)
-				break;
-
-			if (!transitionTimer.IsRunning())
+				stage.UpdateGameplay(updateData);
+			else
 			{
-				AudioManager::Stop(M_BOSS_BATTLE);
-				AudioManager::Play(SE_STAGE_CLEAR);
-				transitionTimer.Start();
-			}
+				updateData.isStopwatchActive = true;
+				stage.UpdateGameplay(updateData);
 
-			if (!AudioManager::IsPlaying(SE_STAGE_CLEAR) && player.GetData().health.Value() == MAX_HEALTH)
-			{
-				currentState = State::CONVERTING_TIME_REMAINING_TO_EXP;
-				transitionTimer.Reset();
-				scoreUpdateTimer.Start();
+				if (!transitionTimer.IsRunning())
+				{
+					AudioManager::Stop(M_BOSS_BATTLE);
+					AudioManager::Play(SE_STAGE_CLEAR);
+					transitionTimer.Start();
+				}
+
+				if (!AudioManager::IsPlaying(SE_STAGE_CLEAR) && player.GetData().health.Value() == MAX_HEALTH)
+				{
+					currentState = State::CONVERTING_TIME_REMAINING_TO_EXP;
+					transitionTimer.Reset();
+					scoreUpdateTimer.Start();
+					soundEffectTimer.Start();
+				}
 			}
+
 			break;
 
 		case State::CONVERTING_TIME_REMAINING_TO_EXP:
@@ -89,10 +95,14 @@ void LevelCompletedCutscene::Update(UpdateData &updateData)
 					player.AddExp(20);
 					auto counter = MathHelper::Max(gameplayData.timeLeft.GetCounter() - 2, 0);
 					gameplayData.timeLeft.SetCounter(counter);
-					//AudioManager::Reset(SE_GETTING_TIME_BONUS);
-					AudioManager::Play(SE_GETTING_TIME_BONUS);
 					scoreUpdateTimer.Restart();
 				}
+
+				if (soundEffectTimer.ElapsedMilliseconds() >= CONVERTING_TIME_REMAINING_TO_EXP_SOUND_EFFECT_UPDATE_TIME)
+				{
+					AudioManager::Play(SE_GETTING_TIME_BONUS);
+					soundEffectTimer.Restart();
+				}
 			}
 			else // gameplayData.timeLeft.GetCounter() == 0
 			{
@@ -115,7 +125,6 @@ void LevelCompletedCutscene::Update(UpdateData &updateData)
 				{
 					player.AddExp(100);
 					player.AddHeart(-1);
-					AudioManager::Reset(SE_GETTING_HEART_BONUS);
 					AudioManager::Play(SE_GETTING_HEART_BONUS);
 					scoreUpdateTimer.Restart();
 				}
diff --git a/src/GameCuaTao/Castlevania/Scenes/Stages/LevelCompletedCutscene.h b/src/GameCuaTao/Castlevania/Scenes/Stages/LevelCompletedCutscene.h
@@ -25,6 +25,7 @@ namespace Castlevania
 		GameplayData &gameplayData;
 		State currentState;
 		GameObject *crystalBall;
+		Stopwatch soundEffectTimer;
 		Stopwatch transitionTimer;
 		Stopwatch scoreUpdateTimer;
 	};
diff --git a/src/GameCuaTao/Castlevania/Scenes/Stages/Stage.cpp b/src/GameCuaTao/Castlevania/Scenes/Stages/Stage.cpp
@@ -296,7 +296,12 @@ void Stage::UpdateGameObjects(UpdateData &updateData)
 
 void Stage::UpdateGameplay(UpdateData &updateData)
 {
-	camera->LookAt(player->GetOriginPosition(), Scrolling::Horizontally);
+	// Dont follow if the player is dying because the dying sprite (player laying dead)
+	// is wider than other sprites which make the camera glitching when getting
+	// position from GetOriginPosition()
+	if (player->GetState() == ObjectState::NORMAL)
+		camera->LookAt(player->GetOriginPosition(), Scrolling::Horizontally);
+
 	UpdateGameObjects(updateData);
 
 	if (!updateData.isStopwatchActive)
diff --git a/src/GameCuaTao/Castlevania/Utilities/AudioManager.cpp b/src/GameCuaTao/Castlevania/Utilities/AudioManager.cpp
@@ -7,7 +7,7 @@ float AudioManager::volume;
 
 void AudioManager::LoadContent(ContentManager &content)
 {
-	for (auto const [audioName, path] : GAME_AUDIO)
+	for (auto const &[audioName, path] : GAME_AUDIO)
 	{
 		soundDict[audioName] = content.Load<Sound>(path);
 	}
@@ -47,7 +47,6 @@ void AudioManager::PlayLoop(std::string name)
 	auto sound = soundDict[name];
 	if (sound != nullptr)
 	{
-		sound->Reset();
 		sound->Play(0, DSBPLAY_LOOPING);
 	}
 }
diff --git a/src/GameCuaTao/Castlevania/Utilities/DevTool.cpp b/src/GameCuaTao/Castlevania/Utilities/DevTool.cpp
@@ -439,14 +439,30 @@ void DevTool::SpawnEffect()
 	activeEffects.push_back(std::move(effect));
 }
 
-void DevTool::NextMap()
+void DevTool::OnChangingMap()
 {
+	if (maps[currentMapIndex] != stage.currentMap)
+	{
+		for (int i = 0; i < maps.size() - 1; i++)
+			if (maps[i] == stage.currentMap)
+			{
+				currentMapIndex = i;
+				break;
+			}
+	}
+
 	if (maps[currentMapIndex] == Map::INTRO)
 	{
 		player.EnableControl(true);
 		player.SetSpeed(125);
 		player.Idle();
+		AudioManager::StopAll();
 	}
+}
+
+void DevTool::NextMap()
+{
+	OnChangingMap();
 
 	if (++currentMapIndex > (int)maps.size() - 1)
 		currentMapIndex = 0;
@@ -456,12 +472,7 @@ void DevTool::NextMap()
 
 void DevTool::PreviousMap()
 {
-	if (maps[currentMapIndex] == Map::INTRO)
-	{
-		player.EnableControl(true);
-		player.SetSpeed(125);
-		player.Idle();
-	}
+	OnChangingMap();
 
 	if (--currentMapIndex < 0)
 		currentMapIndex = maps.size() - 1;
diff --git a/src/GameCuaTao/Castlevania/Utilities/DevTool.h b/src/GameCuaTao/Castlevania/Utilities/DevTool.h
@@ -60,6 +60,7 @@ namespace Castlevania
 		void SpawnObject();
 		void SpawnEffect();
 
+		void OnChangingMap();
 		void NextMap();
 		void PreviousMap();
 	};

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ void Fishman::Update(UpdateData &updateData)`
`29`	`29`
`30`	`30`	`if (updateData.isStopwatchActive)`
`31`	`31`	`if (renderingSystem != nullptr && fishmanState == FishmanState::LAUNCHING)`
	`32`	`+ {`
`32`	`33`	`renderingSystem->Update(updateData.gameTime); // Update launching effect`
	`34`	`+ return;`
	`35`	`+ }`
`33`	`36`
`34`	`37`	`switch (fishmanState)`
`35`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ GiantBatState GiantBat::GetGiantBatState()`
`98`	`98`	`void GiantBat::Update(UpdateData &updateData)`
`99`	`99`	`{`
`100`	`100`	`Enemy::Update(updateData);`
	`101`	`+`
	`102`	`+ if (updateData.isStopwatchActive)`
	`103`	`+ return;`
`101`	`104`
`102`	`105`	`switch (giantBatState)`
`103`	`106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -508,8 +508,13 @@ void PlayerResponseSystem::OnCollideWithStairDownTrigger(Trigger &trigger)`
`508`	`508`
`509`	`509`	`void PlayerResponseSystem::OnCollideWithNextMapTrigger(Trigger &trigger)`
`510`	`510`	`{`
`511`		`- parent.Notify(NEXT_MAP_CUTSCENE_STARTED);`
`512`		`- trigger.GetBody().Enabled(false);`
	`511`	`+ // Fix an edge case where player just jumps and collides with the next map trigger in`
	`512`	`+ // underground map (should trigger when walking up/down stairs and on ground only)`
	`513`	`+ if (!parent.IsOnTheAir())`
	`514`	`+ {`
	`515`	`+ parent.Notify(NEXT_MAP_CUTSCENE_STARTED);`
	`516`	`+ trigger.GetBody().Enabled(false);`
	`517`	`+ }`
`513`	`518`	`}`
`514`	`519`
`515`	`520`	`void PlayerResponseSystem::OnCollideWithMoneyBagTrigger(Trigger &trigger)`