Merge pull request #326 from Zegeri/development

Bushes, improve battle interpreter, fix rotation effect and other fixes

Author: fdelapena

src/bitmap_screen.cpp

@@ -73,19 +73,14 @@ void BitmapScreen::BlitScreen(int x, int y, Rect const& src_rect) {
 
 	Rect rect = src_rect_effect.GetSubRect(src_rect);
 
-	Rect bush_rect = src_rect_effect;
-	bush_rect.height -= bush_effect;
-	bush_rect = bush_rect.GetSubRect(src_rect);
-	int bush_y = (rect.y + rect.height) - (bush_rect.y + bush_rect.height);
-
 	bool need_scale = false;
-	BitmapRef draw_bitmap = Refresh(rect, need_scale, bush_y);
+	BitmapRef draw_bitmap = Refresh(rect, need_scale);
 
 	bitmap_changed = false;
 	needs_refresh = false;
 
 	if(draw_bitmap) {
-		BlitScreenIntern(*draw_bitmap, x, y, rect, need_scale, bush_y);
+		BlitScreenIntern(*draw_bitmap, x, y, rect, need_scale, bush_effect);
 	}
 }
 
@@ -94,10 +89,9 @@ void BitmapScreen::BlitScreenTiled(Rect const& src_rect, Rect const& dst_rect, i
 		return;
 
 	Rect rect = src_rect_effect.GetSubRect(src_rect);
-	int bush_y = 0;
 
 	bool need_scale = false;
-	BitmapRef draw_bitmap = Refresh(rect, need_scale, bush_y);
+	BitmapRef draw_bitmap = Refresh(rect, need_scale);
 
 	bitmap_changed = false;
 	needs_refresh = false;
@@ -330,14 +324,12 @@ double BitmapScreen::GetWaverEffectPhase() const {
 }
 
 void BitmapScreen::BlitScreenIntern(Bitmap const& draw_bitmap, int x, int y,
-									Rect const& src_rect, bool need_scale, int bush_y) {
+									Rect const& src_rect, bool need_scale, int opacity_split) {
 	if (! &draw_bitmap)
 		return;
 
 	BitmapRef dst = DisplayUi->GetDisplaySurface();
 
-	int opacity_split = bush_y;
-
 	double zoom_x = need_scale ? zoom_x_effect : 1.0;
 	double zoom_y = need_scale ? zoom_y_effect : 1.0;
 
@@ -347,7 +339,7 @@ void BitmapScreen::BlitScreenIntern(Bitmap const& draw_bitmap, int x, int y,
 					 waver_effect_depth, waver_effect_phase);
 }
 
-BitmapRef BitmapScreen::Refresh(Rect& rect, bool& need_scale, int& bush_y) {
+BitmapRef BitmapScreen::Refresh(Rect& rect, bool& need_scale) {
 	need_scale = false;
 
 	rect.Adjust(bitmap->GetWidth(), bitmap->GetHeight());
@@ -365,6 +357,8 @@ BitmapRef BitmapScreen::Refresh(Rect& rect, bool& need_scale, int& bush_y) {
 		flipx_effect != current_flip_x ||
 		flipy_effect != current_flip_y;
 	bool effects_rect_changed = rect != bitmap_effects_src_rect;
+	bool zoom_changed = zoom_x_effect != current_zoom_x ||
+    	zoom_y_effect != current_zoom_y;
 
 	if (effects_changed || effects_rect_changed || bitmap_changed) {
 		bitmap_effects_valid = false;
@@ -429,43 +423,12 @@ BitmapRef BitmapScreen::Refresh(Rect& rect, bool& need_scale, int& bush_y) {
 		src_bitmap = bitmap_effects;
 	}
 
-	if (no_zoom || angle_effect != 0.0)
-		return src_bitmap;
-
-	int zoomed_width  = (int)(rect.width  * zoom_x_effect);
-	int zoomed_height = (int)(rect.height * zoom_y_effect);
-
-	if (zoomed_width > 640 || zoomed_height > 640) {
-		need_scale = true;
+	if (no_zoom && !zoom_changed)
 		return src_bitmap;
-	}
-
-	bool zoom_changed =
-		zoom_x_effect != current_zoom_x ||
-		zoom_y_effect != current_zoom_y;
-
-	bool scale_rect_changed = rect != bitmap_scale_src_rect;
-
-	if (zoom_changed || scale_rect_changed)
-		bitmap_scale_valid = false;
-
-	if (bitmap_scale && bitmap_scale_valid) {
-		bush_y = bush_y * bitmap_scale->GetHeight() / rect.height;
-		rect = bitmap_scale->GetRect();
-		return bitmap_scale;
-	}
 
 	current_zoom_x = zoom_x_effect;
 	current_zoom_y = zoom_y_effect;
+	need_scale = true;
 
-	bitmap_scale.reset();
-
-	bitmap_scale = src_bitmap->Resample(zoomed_width, zoomed_height, rect);
-
-	bitmap_scale_src_rect = rect;
-	bitmap_scale_valid = true;
-
-	bush_y = bush_y * bitmap_scale->GetHeight() / rect.height;
-	rect = bitmap_scale->GetRect();
-	return bitmap_scale;
+	return src_bitmap;
 }

src/bitmap_screen.h

@@ -321,7 +321,7 @@ class BitmapScreen {
 	void BlitScreenIntern(Bitmap const& draw_bitmap, int x, int y, Rect const& src_rect,
 								  bool need_scale, int bush_y);
 
-	BitmapRef Refresh(Rect& rect, bool& need_scale, int& bush_y);
+	BitmapRef Refresh(Rect& rect, bool& need_scale);
 
 	BitmapRef bitmap_effects;
 	BitmapRef bitmap_scale;

src/effects.cpp

@@ -80,10 +80,9 @@ void Bitmap::EffectsBlit(int x, int y, Bitmap const& src, Rect const& src_rect,
 		EffectsBlit(x, y, src, blit_rect,
 					top_opacity, waver_depth, waver_phase);
 
-		blit_rect = src_rect;
-		blit_rect.y = src_rect.height - opacity_split;
+		blit_rect.y += blit_rect.height;
 		blit_rect.height = opacity_split;
-		x += src_rect.height - opacity_split;
+		y += src_rect.height - opacity_split;
 		EffectsBlit(x, y, src, blit_rect,
 					bottom_opacity, waver_depth, waver_phase);
 	}
@@ -138,10 +137,11 @@ void Bitmap::EffectsBlit(int x, int y, Bitmap const& src, Rect const& src_rect_,
 	}
 
 	if (rotate) {
-		Matrix fwd = Matrix::Setup(1.0-angle, zoom_x, zoom_y, (src_rect.width - src_rect.x) / 2, (src_rect.height - src_rect.y) /2, x, y);
+		Matrix fwd = Matrix::Setup(-angle, zoom_x, zoom_y,
+			(src_rect.width - src_rect.x) / 2, (src_rect.height - src_rect.y) / 2, 
+			x + src_rect.width * zoom_x / 2, y + src_rect.height * zoom_y / 2);
 		EffectsBlit(fwd, src, src_rect, top_opacity, bottom_opacity, opacity_split);
-	}
-	else if (scale)
+	} else if (scale)
 		EffectsBlit(x, y, *draw, src_rect,
 					top_opacity, bottom_opacity, opacity_split,
 					zoom_x, zoom_y,

src/filefinder.cpp

@@ -185,6 +185,10 @@ EASYRPG_SHARED_PTR<FileFinder::ProjectTree> FileFinder::CreateProjectTree(std::s
 		 tree->directories : tree->files)[i->first] = i->second;
 	}
 
+	// Stop here if the tree is invalid
+	if (p == Main_Data::project_path && !IsRPG2kProject(*tree) && !IsEasyRpgProject(*tree))
+		return tree;
+
 	for(string_map::const_iterator i = tree->directories.begin(); i != tree->directories.end(); ++i) {
 		GetDirectoryMembers(MakePath(tree->project_path, i->second), RECURSIVE)
 			.members.swap(tree->sub_members[i->first]);

src/game_battle.cpp

@@ -166,17 +166,27 @@ bool Game_Battle::AreConditionsMet(const RPG::TroopPageCondition& condition) {
 	return false;
 	}*/
 
+	if (condition.flags.fatigue) {
+		int fatigue = Main_Data::game_party->GetFatigue();
+		if (fatigue < condition.fatigue_min || fatigue > condition.fatigue_max)
+			return false;
+	}
+
 	if (condition.flags.enemy_hp) {
 		Game_Battler& enemy = (*Main_Data::game_enemyparty)[condition.enemy_id];
 		int hp = enemy.GetHp();
-		if (hp < condition.enemy_hp_min || hp > condition.enemy_hp_max)
+		int hpmin = enemy.GetMaxHp() * condition.enemy_hp_min / 100;
+		int hpmax = enemy.GetMaxHp() * condition.enemy_hp_max / 100;
+		if (hp < hpmin || hp > hpmax)
 			return false;
 	}
 
 	if (condition.flags.actor_hp) {
 		Game_Actor* actor = Game_Actors::GetActor(condition.actor_id);
 		int hp = actor->GetHp();
-		if (hp < condition.actor_hp_min || hp > condition.actor_hp_max)
+		int hpmin = actor->GetMaxHp() * condition.actor_hp_min / 100;
+		int hpmax = actor->GetMaxHp() * condition.actor_hp_max / 100;
+		if (hp < hpmin || hp > hpmax)
 			return false;
 	}
 	/*
@@ -189,7 +199,6 @@ bool Game_Battle::AreConditionsMet(const RPG::TroopPageCondition& condition) {
 	if (ally->last_command != condition.command_id)
 	return false;
 	}*/
-
 	return true;
 }
 

src/game_character.cpp

@@ -130,6 +130,10 @@ bool Game_Character::IsLandable(int x, int y) const
 	return true;
 }
 
+bool Game_Character::IsMessageBlocking() const {
+	return Game_Message::message_waiting && !Game_Message::GetContinueEvents();
+}
+
 void Game_Character::MoveTo(int x, int y) {
 	SetX(x % Game_Map::GetWidth());
 	SetY(y % Game_Map::GetHeight());
@@ -217,7 +221,7 @@ void Game_Character::Update() {
 	if (stop_count >= ((GetMoveFrequency() > 7) ? 0 : pow(2.0, 9 - GetMoveFrequency()))) {
 		if (IsMoveRouteOverwritten()) {
 			MoveTypeCustom();
-		} else if (Game_Message::GetContinueEvents() || !Game_Message::message_waiting) {
+		} else if (!IsMessageBlocking()) {
 			UpdateSelfMovement();
 		}
 	}
@@ -1175,8 +1179,8 @@ bool Game_Character::IsSpinning() {
 	return animation_type == RPG::EventPage::AnimType_spin;
 }
 
-void Game_Character::UpdateBushDepth() {
-	// TODO
+int Game_Character::GetBushDepth() {
+	return Game_Map::GetBushDepth(GetX(), GetY());
 }
 
 void Game_Character::SetGraphic(const std::string& name, int index) {

src/game_character.h

@@ -349,6 +349,13 @@ class Game_Character {
 	 */
 	virtual bool IsLandable(int x, int y) const;
 
+ 	/**
+	 * Gets if a message is halting this character's processes.
+	 *
+	 * @return whether the character is halted by a message.
+	 */
+	virtual bool IsMessageBlocking() const;
+
 	/**
 	 * Moves the character to a new tile.
 	 *
@@ -729,7 +736,12 @@ class Game_Character {
 	 */
 	bool IsSpinning();
 
-	virtual void UpdateBushDepth();
+	/**
+	 * Gets the bush depth of the tile where this character is standing
+	 *
+	 * @return Bush depth at this character's position
+	 */
+	int GetBushDepth();
 
 	void SetGraphic(const std::string& name, int index);
 

src/game_event.cpp

@@ -20,6 +20,7 @@
 #include "game_actor.h"
 #include "game_actors.h"
 #include "game_map.h"
+#include "game_message.h"
 #include "game_party.h"
 #include "game_player.h"
 #include "game_switches.h"
@@ -224,6 +225,11 @@ void Game_Event::SetFlashTimeLeft(int time_left) {
 	data.flash_time_left = time_left;
 }
 
+bool Game_Event::IsMessageBlocking() const {
+	return Game_Message::message_waiting &&
+		!(Game_Message::GetContinueEvents() && Game_Message::owner_id != ID);
+}
+
 bool Game_Event::GetThrough() const {
 	return page == NULL || Game_Character::GetThrough();
 }

src/game_event.h

@@ -83,6 +83,7 @@ class Game_Event : public Game_Character {
 	void SetFlashLevel(int flash_level);
 	int GetFlashTimeLeft() const;
 	void SetFlashTimeLeft(int time_left);
+	bool IsMessageBlocking() const;
 	/** @} */
 
 	/**