Larger Events Version 3

Resolved the whitespace/formatting issues, make the new code a branch off the original so it only executes when it the game detects a {_X} or a {!Y} string in the filename of a charset and restored the original CheckOrMakeWayEx code and made the larger events a branch so nothing gets broken down the way.

Author: LizardKing777

src/game_character.cpp

@@ -833,6 +833,7 @@ bool Game_Character::CalculateMoveRoute(const CalculateMoveRouteArgs& args) {
 	std::unordered_map<int, SearchNode> graph;
 	std::map<std::pair<int, int>, SearchNode> graph_by_coord;
 	queue.push_back(start);
+	int id = 0;
 	int idd = 0;
 	int steps_taken = 0;
 	SearchNode closest_node = {args.dest_x, args.dest_y, std::numeric_limits<int>::max(), -1}; // Initialize with a very high cost.
@@ -998,7 +999,7 @@ bool Game_Character::CalculateMoveRoute(const CalculateMoveRouteArgs& args) {
 				}
 			}
 		}
-
+		id++;
 		// Calculate the Manhattan distance between the current node and the destination
 		int manhattan_dist = abs(args.dest_x - n.x) + abs(args.dest_y - n.y);
 
@@ -1277,39 +1278,32 @@ float Game_Character::GetHitboxRadius() const {
 }
 
 bool Game_Character::IsInPosition(int x, int y) const {
-    int x1, x2, y1, y2;
-    GetTileOffsets(x1, x2, y1, y2);
+	int x1, x2, y1, y2;
+	GetTileOffsets(x1, x2, y1, y2);
+	bool is_expanded = (x1 != 0 || x2 != 0 || y1 != 0 || y2 != 0);
 
-    int left = GetX() + x1;
-    int right = GetX() + x2;
-    int top = GetY() + y1;
-    int bottom = GetY() + y2;
+	if (!is_expanded) {
+		// Standard Branch: Exact coordinate match
+		return GetX() == x && GetY() == y;
+	}
 
-    if (Game_Map::LoopVertical()) {
-        int h = Game_Map::GetTilesY();
-        bool found_y = false;
-        for (int j = top; j <= bottom; ++j) {
-            if (Utils::PositiveModulo(j, h) == y) {
-                found_y = true;
-                break;
-            }
-        }
-        if (!found_y) return false;
-    } else if (y < top || y > bottom) {
-        return false;
-    }
+	// Extended Branch: Rectangle footprint match
+	if (GetY() + y1 > y || GetY() + y2 < y) {
+		return false;
+	}
 
-    if (Game_Map::LoopHorizontal()) {
-        int w = Game_Map::GetTilesX();
-        for (int i = left; i <= right; ++i) {
-            if (Utils::PositiveModulo(i, w) == x) {
-                return true;
-            }
-        }
-        return false;
-    }
+	int left_edge = GetX() + x1;
+	int right_edge = GetX() + x2;
+
+	if (Game_Map::LoopHorizontal()) {
+		int map_w = Game_Map::GetTilesX();
+		for (int i = left_edge; i <= right_edge; ++i) {
+			if (Utils::PositiveModulo(i, map_w) == x) return true;
+		}
+		return false;
+	}
 
-    return x >= left && x <= right;
+	return x >= left_edge && x <= right_edge;
 }
 
 int Game_Character::GetOpacity() const {

src/game_character.h

@@ -815,17 +815,30 @@ class Game_Character {
 	 * @param x X tile position
 	 * @param y Y tile position
 	 * @return If on tile or moving towards
-	 */
+	 */
+
 	virtual bool IsInPosition(int x, int y) const;
 
-    int GetTileWidth() const;
-    int GetTileHeight() const;
-    float GetHitboxRadius() const;
+	/**
+	 * Calculates the relative tile offsets based on filename tags.
+	 * min_dx/max_dx handle horizontal ({_#}) and min_dy/max_dy handle vertical ({!#}).
+	 */
+	void GetTileOffsets(int& min_dx, int& max_dx, int& min_dy, int& max_dy) const;
 
-    void GetTileOffsets(int& min_dx, int& max_dx, int& min_dy, int& max_dy) const;
-    float GetHitboxCenterX() const;
-    float GetHitboxCenterY() const;
-
+	/** Returns the total width of the character in 16px tiles. */
+	int GetTileWidth() const;
+
+	/** Returns the total height of the character in 16px tiles. */
+	int GetTileHeight() const;
+
+	/** Returns the collision radius in units (1.0 = 16px) for pixel movement. */
+	float GetHitboxRadius() const;
+
+	/** Returns the absolute X center of the expanded hitbox in logical units. */
+	float GetHitboxCenterX() const;
+
+	/** Returns the absolute Y center of the expanded hitbox in logical units. */
+	float GetHitboxCenterY() const;
 
 	/**
 	 * Gets current opacity of character.

src/game_event.cpp

@@ -34,7 +34,6 @@
 #include "output.h"
 #include <cmath>
 #include <cassert>
-#include <optional>
 
 Game_Event::Game_Event(int map_id, const lcf::rpg::Event* event) :
 	Game_EventBase(Event),
@@ -310,10 +309,9 @@ bool Game_Event::WasStartedByDecisionKey() const {
 	return data()->triggered_by_decision_key;
 }
 
-std::optional<lcf::rpg::EventPage::Trigger> Game_Event::GetTrigger() const {
-	if (page)
-		return static_cast<lcf::rpg::EventPage::Trigger>(page->trigger);
-	return std::nullopt;
+lcf::rpg::EventPage::Trigger Game_Event::GetTrigger() const {
+	int trigger = page ? page->trigger : -1;
+	return static_cast<lcf::rpg::EventPage::Trigger>(trigger);
 }
 
 
@@ -356,69 +354,81 @@ bool Game_Event::CheckEventAutostart() {
 }
 
 bool Game_Event::CheckEventCollision() {
-    if (GetTrigger() == lcf::rpg::EventPage::Trigger_collision
-            && GetLayer() != lcf::rpg::EventPage::Layers_same
-            && !Main_Data::game_player->IsMoveRouteOverwritten()
-            && !Game_Map::GetInterpreter().IsRunning())
-    {
-        // Iterate through our own footprint to see if any tile hits the (potentially large) player
-        int min_dx, max_dx, min_dy, max_dy;
-        GetTileOffsets(min_dx, max_dx, min_dy, max_dy);
+	if (GetTrigger() == lcf::rpg::EventPage::Trigger_collision
+			&& GetLayer() != lcf::rpg::EventPage::Layers_same
+			&& !Main_Data::game_player->IsMoveRouteOverwritten()
+			&& !Game_Map::GetInterpreter().IsRunning())
+	{
+		int x1, x2, y1, y2;
+		GetTileOffsets(x1, x2, y1, y2);
+		bool is_expanded = (x1 != 0 || x2 != 0 || y1 != 0 || y2 != 0);
 
-        for (int dy = min_dy; dy <= max_dy; ++dy) {
-            for (int dx = min_dx; dx <= max_dx; ++dx) {
-                if (Main_Data::game_player->IsInPosition(Game_Map::RoundX(GetX() + dx), Game_Map::RoundY(GetY() + dy))) {
-                    ScheduleForegroundExecution(false, true);
-                    SetStopCount(0);
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
+		if (!is_expanded) {
+			// Standard logic
+			if (Main_Data::game_player->GetX() == GetX() && Main_Data::game_player->GetY() == GetY()) {
+				ScheduleForegroundExecution(false, true);
+				SetStopCount(0);
+				return true;
+			}
+			return false;
+		}
+
+		for (int dy = y1; dy <= y2; ++dy) {
+			for (int dx = x1; dx <= x2; ++dx) {
+				if (Main_Data::game_player->IsInPosition(Game_Map::RoundX(GetX() + dx), Game_Map::RoundY(GetY() + dy))) {
+					ScheduleForegroundExecution(false, true);
+					SetStopCount(0);
+					return true;
+				}
+			}
+		}
+	}
+	return false;
 }
 
 void Game_Event::CheckCollisonOnMoveFailure() {
-    if (Game_Map::GetInterpreter().IsRunning()) return;
-
-    int min_dx, max_dx, min_dy, max_dy;
-    GetTileOffsets(min_dx, max_dx, min_dy, max_dy);
-
-    int direction = GetDirection();
+	if (Game_Map::GetInterpreter().IsRunning()) return;
 
-    // Scan leading edge of event
-    if (direction == Up || direction == Down) {
-        int target_dy = (direction == Up) ? min_dy : max_dy;
-        for (int dx = min_dx; dx <= max_dx; ++dx) {
-            int fx = Game_Map::RoundX(GetX() + dx);
-            int fy = Game_Map::RoundY(Game_Map::YwithDirection(GetY() + target_dy, direction));
+	int x1, x2, y1, y2;
+	GetTileOffsets(x1, x2, y1, y2);
+	bool is_expanded = (x1 != 0 || x2 != 0 || y1 != 0 || y2 != 0);
 
-            if (Main_Data::game_player->IsInPosition(fx, fy) &&
-                GetLayer() == lcf::rpg::EventPage::Layers_same &&
-                GetTrigger() == lcf::rpg::EventPage::Trigger_collision)
-            {
-                ScheduleForegroundExecution(false, true);
-                SetStopCount(0);
-                return;
-            }
-        }
-    }
-    else if (direction == Left || direction == Right) {
-        int target_dx = (direction == Left) ? min_dx : max_dx;
-        for (int dy = min_dy; dy <= max_dy; ++dy) {
-            int fx = Game_Map::RoundX(Game_Map::XwithDirection(GetX() + target_dx, direction));
-            int fy = Game_Map::RoundY(GetY() + dy);
+	if (!is_expanded) {
+		// Standard logic
+		int fx = Game_Map::XwithDirection(GetX(), GetDirection());
+		int fy = Game_Map::YwithDirection(GetY(), GetDirection());
+		if (Main_Data::game_player->GetX() == fx && Main_Data::game_player->GetY() == fy &&
+			GetLayer() == lcf::rpg::EventPage::Layers_same && GetTrigger() == lcf::rpg::EventPage::Trigger_collision) {
+			ScheduleForegroundExecution(false, true);
+			SetStopCount(0);
+		}
+		return;
+	}
 
-            if (Main_Data::game_player->IsInPosition(fx, fy) &&
-                GetLayer() == lcf::rpg::EventPage::Layers_same &&
-                GetTrigger() == lcf::rpg::EventPage::Trigger_collision)
-            {
-                ScheduleForegroundExecution(false, true);
-                SetStopCount(0);
-                return;
-            }
-        }
-    }
+	int dir = GetDirection();
+	if (dir == Up || dir == Down) {
+		int target_dy = (dir == Up) ? y1 : y2;
+		for (int dx = x1; dx <= x2; ++dx) {
+			int fx = Game_Map::RoundX(GetX() + dx);
+			int fy = Game_Map::RoundY(Game_Map::YwithDirection(GetY() + target_dy, dir));
+			if (Main_Data::game_player->IsInPosition(fx, fy) && GetLayer() == lcf::rpg::EventPage::Layers_same && GetTrigger() == lcf::rpg::EventPage::Trigger_collision) {
+				ScheduleForegroundExecution(false, true);
+				SetStopCount(0);
+				return;
+			}
+		}
+	} else {
+		int target_dx = (dir == Left) ? x1 : x2;
+		for (int dy = y1; dy <= y2; ++dy) {
+			int fx = Game_Map::RoundX(Game_Map::XwithDirection(GetX() + target_dx, dir));
+			int fy = Game_Map::RoundY(GetY() + dy);
+			if (Main_Data::game_player->IsInPosition(fx, fy) && GetLayer() == lcf::rpg::EventPage::Layers_same && GetTrigger() == lcf::rpg::EventPage::Trigger_collision) {
+				ScheduleForegroundExecution(false, true);
+				SetStopCount(0);
+				return;
+			}
+		}
+	}
 }
 
 bool Game_Event::Move(int dir) {