Merge pull request #1439 from fmatthew5876/fix_skill_usable

Various engine logic fixes

src/fps_overlay.cpp

@@ -79,7 +79,7 @@ void FpsOverlay::Draw() {
 	// Always drawn when speedup is on independent of FPS
 	if (last_speed_mod > 1) {
 		if (speedup_dirty) {
-			std::string text = "> x" + Utils::ToString(last_speed_mod);
+			std::string text = "> x" + std::to_string(last_speed_mod);
 
 			Rect rect = Font::Default()->GetSize(text);
 

src/game_battle.cpp

@@ -101,6 +101,14 @@ void Game_Battle::Quit() {
 		(*it)->SetBattleAlgorithm(BattleAlgorithmRef());
 	}
 
+	Main_Data::game_party->IncBattleCount();
+	switch (Game_Temp::battle_result) {
+		case Game_Temp::BattleVictory: Main_Data::game_party->IncWinCount(); break;
+		case Game_Temp::BattleEscape: Main_Data::game_party->IncRunCount(); break;
+		case Game_Temp::BattleDefeat: Main_Data::game_party->IncDefeatCount(); break;
+		case Game_Temp::BattleAbort: break;
+	}
+
 	page_executed.clear();
 	page_can_run.clear();
 

src/game_battlealgorithm.cpp

@@ -210,17 +210,15 @@ std::string Game_BattleAlgorithm::AlgorithmBase::GetAttackFailureMessage(const s
 }
 
 std::string Game_BattleAlgorithm::AlgorithmBase::GetHpSpRecoveredMessage(int value, const std::string& points) const {
-	std::stringstream ss;
-
 	if (Player::IsRPG2kE()) {
-		ss << value;
 		return Utils::ReplacePlaceholders(
 			Data::terms.hp_recovery,
 			{'S', 'V', 'U'},
-			{GetTarget()->GetName(), ss.str(), points}
+			{GetTarget()->GetName(), std::to_string(value), points}
 		);
 	}
 	else {
+		std::stringstream ss;
 		std::string particle, particle2, space = "";
 
 		ss << GetTarget()->GetName();
@@ -282,17 +280,16 @@ std::string Game_BattleAlgorithm::AlgorithmBase::GetHpSpAbsorbedMessage(int valu
 	const std::string& message = target_is_ally ?
 		Data::terms.actor_hp_absorbed :
 		Data::terms.enemy_hp_absorbed;
-	std::stringstream ss;
 
 	if (Player::IsRPG2kE()) {
-		ss << value;
 		return Utils::ReplacePlaceholders(
 			message,
 			{'S', 'O', 'V', 'U'},
-			{GetSource()->GetName(), GetTarget()->GetName(), ss.str(), points}
+			{GetSource()->GetName(), GetTarget()->GetName(), std::to_string(value), points}
 		);
 	}
 	else {
+		std::stringstream ss;
 		std::string particle, particle2, space = "";
 
 		ss << GetTarget()->GetName();
@@ -319,17 +316,15 @@ std::string Game_BattleAlgorithm::AlgorithmBase::GetDamagedMessage() const {
 		Data::terms.enemy_damaged;
 	int value = GetAffectedHp();
 
-	std::stringstream ss;
-
 	if (Player::IsRPG2kE()) {
-		ss << value;
 		return Utils::ReplacePlaceholders(
 			message,
 			{'S', 'V', 'U'},
-			{GetTarget()->GetName(), ss.str(), Data::terms.health_points}
+			{GetTarget()->GetName(), std::to_string(value), Data::terms.health_points}
 		);
 	}
 	else {
+		std::stringstream ss;
 		std::string particle, space = "";
 		ss << GetTarget()->GetName();
 
@@ -348,17 +343,16 @@ std::string Game_BattleAlgorithm::AlgorithmBase::GetParameterChangeMessage(bool
 	const std::string& message = is_positive ?
 		Data::terms.parameter_increase :
 		Data::terms.parameter_decrease;
-	std::stringstream ss;
 
 	if (Player::IsRPG2kE()) {
-		ss << value;
 		return Utils::ReplacePlaceholders(
 			message,
 			{'S', 'V', 'U'},
-			{GetTarget()->GetName(), ss.str(), points}
+			{GetTarget()->GetName(), std::to_string(value), points}
 		);
 	}
 	else {
+		std::stringstream ss;
 		std::string particle, particle2, space = "";
 		ss << GetTarget()->GetName();
 

src/game_battler.cpp

@@ -26,6 +26,7 @@
 #include "game_party.h"
 #include "game_party_base.h"
 #include "game_switches.h"
+#include "game_system.h"
 #include "util_macro.h"
 #include "main_data.h"
 #include "utils.h"
@@ -311,8 +312,10 @@ bool Game_Battler::UseSkill(int skill_id) {
 			}
 		}
 	} else if (skill->type == RPG::Skill::Type_teleport || skill->type == RPG::Skill::Type_escape) {
+		Game_System::SePlay(skill->sound_effect);
 		was_used = true;
 	} else if (skill->type == RPG::Skill::Type_switch) {
+		Game_System::SePlay(skill->sound_effect);
 		Game_Switches[skill->switch_id] = true;
 		was_used = true;
 	}

src/game_character.cpp

@@ -93,13 +93,10 @@ bool Game_Character::IsStopping() const {
 
 bool Game_Character::MakeWay(int x, int y, int d) const {
 	if (d > 3) {
-		int dx = (d == UpRight || d == DownRight) - (d == DownLeft || d == UpLeft);
-		int dy = (d == DownRight || d == DownLeft) - (d == UpRight || d == UpLeft);
-		return ((MakeWay(x, y, dy + 1) && MakeWay(x, y + dy, -dx + 2)) ||
-			(MakeWay(x, y, -dx + 2) && MakeWay(x + dx, y, dy + 1)));
+		return MakeWayDiagonal(x, y, d);
 	}
 
-	return Game_Map::MakeWay(x, y, d, *this);
+	return Game_Map::MakeWay(x, y, d, *this, false);
 }
 
 bool Game_Character::IsLandable(int x, int y) const
@@ -954,3 +951,11 @@ int Game_Character::ReverseDir(int dir) {
 		{ Down, Left, Up, Right, DownLeft, UpLeft, UpRight, DownRight };
 	return reversed[dir];
 }
+
+
+bool Game_Character::MakeWayDiagonal(int x, int y, int d) const {
+	int dx = (d == UpRight || d == DownRight) - (d == DownLeft || d == UpLeft);
+	int dy = (d == DownRight || d == DownLeft) - (d == UpRight || d == UpLeft);
+	return ((MakeWay(x, y, dy + 1) && MakeWay(x, y + dy, -dx + 2)) ||
+			(MakeWay(x, y, -dx + 2) && MakeWay(x + dx, y, dy + 1)));
+}

src/game_character.h

@@ -703,6 +703,7 @@ class Game_Character {
 	static Game_Character* GetCharacter(int character_id, int event_id);
 
 protected:
+	bool MakeWayDiagonal(int x, int y, int d) const;
 	virtual void UpdateSelfMovement();
 	void UpdateJump();
 

src/game_interpreter.cpp

@@ -176,6 +176,9 @@ void Game_Interpreter::Update() {
 			if (Main_Data::game_player->IsBoardingOrUnboarding())
 				break;
 
+			if (Main_Data::game_player->InVehicle() && Main_Data::game_player->GetVehicle()->IsAscendingOrDescending())
+				break;
+
 			if (Game_Message::message_waiting)
 				break;
 		} else {

src/game_interpreter_battle.cpp

@@ -184,6 +184,7 @@ bool Game_Interpreter_Battle::CommandChangeMonsterHP(RPG::EventCommand const& co
 	enemy.ChangeHp(change);
 
 	if (enemy.IsDead()) {
+		Game_System::SePlay(Game_System::GetSystemSE(Game_System::SFX_EnemyKill));
 		Game_Battle::SetNeedRefresh(true);
 	}
 

src/game_map.cpp

@@ -494,14 +494,14 @@ static CollisionResult TestCollisionDuringMove(
 	return NoCollision;
 }
 
-bool Game_Map::MakeWay(int x, int y, int d, const Game_Character& self) {
+bool Game_Map::MakeWay(int x, int y, int d, const Game_Character& self, bool force_through) {
 	int new_x = RoundX(x + (d == Game_Character::Right ? 1 : d == Game_Character::Left ? -1 : 0));
 	int new_y = RoundY(y + (d == Game_Character::Down ? 1 : d == Game_Character::Up ? -1 : 0));
 
 	if (!Game_Map::IsValid(new_x, new_y))
 		return false;
 
-	if (self.GetThrough()) return true;
+	if (self.GetThrough() || force_through) return true;
 
 	// A character can move to a position with an impassable tile by
 	// standing on top of an event below it. These flags track whether

src/game_map.h

@@ -140,9 +140,10 @@ namespace Game_Map {
 	 * @param y tile y.
 	 * @param d direction
 	 * @param self Character to move.
+	 * @param force_through act as if self.SetThrough() == true
 	 * @return whether is passable.
 	 */
-	bool MakeWay(int x, int y, int d, const Game_Character& self);
+	bool MakeWay(int x, int y, int d, const Game_Character& self, bool force_through);
 
 	/**
 	 * Gets if a tile coordinate is passable in a direction.