From 92fd76f4b8912bc1cf289960b5a1a016ade37fe4 Mon Sep 17 00:00:00 2001
From: Yogi Wiguna <yogiwigunand@gmail.com>
Date: Mon, 23 Feb 2026 12:31:42 +0800
Subject: [PATCH] feat: Introduce an enhanced gridmap addon with procedural
 generation, pathfinding, and initial core game scripts and assets.

---
 addons/enhanced_gridmap/enhanced_gridmap.gd |  32 ++++++++++++--------
 assets/models/meshes/start.res              | Bin 2780 -> 2854 bytes
 assets/models/normal.tres                   |   2 +-
 scenes/main.gd                              |  16 +++++++++-
 scenes/player.gd                            |  18 +++++------
 scripts/managers/player_action_manager.gd   |  14 +++------
 scripts/managers/stop_n_go_manager.gd       |  24 +++++++++++----
 7 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/addons/enhanced_gridmap/enhanced_gridmap.gd b/addons/enhanced_gridmap/enhanced_gridmap.gd
index 26d8e98..91d8e23 100644
--- a/addons/enhanced_gridmap/enhanced_gridmap.gd
+++ b/addons/enhanced_gridmap/enhanced_gridmap.gd
@@ -52,7 +52,11 @@ func _ready():
 		if auto_generate:
 			generate_grid()
 		if auto_randomize:
-			randomize_grid()
+			# Safety check: Don't auto-randomize if game mode manages its own arena
+			if not (ResourceLoader.exists("res://scripts/managers/lobby_manager.gd") \
+				and get_node_or_null("/root/LobbyManager") \
+				and get_node("/root/LobbyManager").game_mode == "Stop n Go"):
+				randomize_grid()
 	validate_item_indices()
 
 # Core grid management functions
@@ -276,9 +280,9 @@ func randomize_floor(floor_index: int, custom_rng_callable: Callable = Callable(
 			if current_item_on_floor in immutable_items:
 				continue
 
-			# IMPORTANT: Only place items if Floor 0 has a walkable tile
+			# IMPORTANT: Only place items if Floor 0 has a valid ground tile (Walkable, Safe Zone, etc)
 			var floor_0_item = get_cell_item(Vector3i(x, 0, z))
-			var is_ground = (floor_0_item == normal_items[0]) # Assuming 0 is ground
+			var is_ground = (floor_0_item != -1) # All tiles on Layer 0 are valid ground
 			
 			if not is_ground:
 				set_cell_item(Vector3i(x, floor_index, z), -1) # Clear item if no ground
@@ -564,25 +568,29 @@ func find_path(start: Vector2, end: Vector2, floor_index: int = 0, clear_path_vi
 		
 	path = astar.get_point_path(start_point, end_point)
 	
+	# TEMPORARY PATH VISUALIZATION - Moved to Layer 2 (Overlay) to protect Floor 0 and Floor 1
 	if visualize:
 		if clear_path_visual:
-			clear_path_visualization(floor_index)
+			clear_path_visualization()
 
-		set_cell_item(Vector3i(start.x, floor_index, start.y), start_item)
-		set_cell_item(Vector3i(end.x, floor_index, end.y), end_item)
+		# Always use Layer 2 for these temporary markers
+		set_cell_item(Vector3i(start.x, 2, start.y), start_item)
+		set_cell_item(Vector3i(end.x, 2, end.y), end_item)
 		for point in path:
-			if point != start and point != end:
-				set_cell_item(Vector3i(point.x, floor_index, point.y), hover_item)
+			if Vector2(point.x, point.y) != start and Vector2(point.x, point.y) != end:
+				set_cell_item(Vector3i(point.x, 2, point.y), hover_item)
 	
 	return path
 
-# Path visualization
-func clear_path_visualization(floor_index: int = 0):
+# Path visualization - Standardized to Layer 2
+func clear_path_visualization(unused_floor_idx: int = 0):
+	# We strictly clear Layer 2 (Overlay) and reset to -1 (Empty)
+	# This ensures we never overwrite Layer 0 (Floor) or Layer 1 (Items)
 	for x in range(columns):
 		for z in range(rows):
-			var cell_item = get_cell_item(Vector3i(x, floor_index, z))
+			var cell_item = get_cell_item(Vector3i(x, 2, z))
 			if cell_item == hover_item or cell_item == start_item or cell_item == end_item:
-				set_cell_item(Vector3i(x, floor_index, z), normal_items[0])
+				set_cell_item(Vector3i(x, 2, z), -1)
 
 # Cost calculation and updates
 func get_cell_cost(x: int, z: int, floor_index: int = 0) -> float:
diff --git a/assets/models/meshes/start.res b/assets/models/meshes/start.res
index 10be0b3b4fed16315056b8d8c0f39e339fe57faf..5cd4a13fdd05f3ee53f8c7ec672e1156690c93af 100644
GIT binary patch
literal 2854
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
ELnBdn<p2Nx

literal 2780
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

diff --git a/assets/models/normal.tres b/assets/models/normal.tres
index fa04288..798df35 100644
--- a/assets/models/normal.tres
+++ b/assets/models/normal.tres
@@ -3,5 +3,5 @@
 [resource]
 resource_name = "tile_a1"
 cull_mode = 2
-albedo_color = Color(0.380392, 0.372549, 0.333333, 1)
+albedo_color = Color(0.38039216, 1, 0.33333334, 1)
 roughness = 0.5
diff --git a/scenes/main.gd b/scenes/main.gd
index c46b88e..58cef46 100644
--- a/scenes/main.gd
+++ b/scenes/main.gd
@@ -444,7 +444,11 @@ func _setup_client_game():
 	print("Client setup - my peer ID: ", my_id)
 	
 	# INITIALIZE ARENA SIZE for Stop n Go locally to prevent out-of-bounds before sync arrives
-	if LobbyManager.game_mode == "Stop n Go" and stop_n_go_manager:
+	if LobbyManager.game_mode == "Stop n Go":
+		if not stop_n_go_manager:
+			stop_n_go_manager = load("res://scripts/managers/stop_n_go_manager.gd").new()
+			stop_n_go_manager.name = "StopNGoManager"
+			add_child(stop_n_go_manager)
 		stop_n_go_manager._apply_arena_setup()
 	
 	# Pre-spawn ALL players known from LobbyManager (including Host ID 1)
@@ -1503,9 +1507,19 @@ func sync_full_grid_data(data: PackedInt32Array):
 	if not enhanced_gridmap:
 		print("[Main] Error: EnhancedGridMap not found!")
 		return
+		
+	# Reapply deterministic Floor 0 before syncing Floor 1 items
+	if LobbyManager.game_mode == "Stop n Go":
+		if not stop_n_go_manager:
+			stop_n_go_manager = load("res://scripts/managers/stop_n_go_manager.gd").new()
+			stop_n_go_manager.name = "StopNGoManager"
+			add_child(stop_n_go_manager)
+		stop_n_go_manager._apply_arena_setup()
 	
 	# Apply the synced data to Floor 1
 	enhanced_gridmap.set_floor_data(1, data)
+	enhanced_gridmap.update_grid_data()
+	enhanced_gridmap.initialize_astar()
 	print("[Main] Grid sync complete.")
 
 
diff --git a/scenes/player.gd b/scenes/player.gd
index 578d49e..17cf7a6 100644
--- a/scenes/player.gd
+++ b/scenes/player.gd
@@ -559,9 +559,10 @@ func receive_spawn_positions_update(occupied_positions: Array):
 		if pos in occupied_positions:
 			highlighted_spawn_points.erase(pos)
 			if enhanced_gridmap:
+				# Clear the highlight from Layer 2 (Overlay) instead of overwriting Floor 0
 				enhanced_gridmap.set_cell_item(
-					Vector3i(pos.x, 0, pos.y),
-					enhanced_gridmap.normal_items[0]
+					Vector3i(pos.x, 2, pos.y),
+					-1
 				)
 	
 	# Now highlight available positions
@@ -1141,11 +1142,10 @@ func clear_spawn_highlights():
 	# Clear the highlighted spawn points array
 	for spawn_pos in highlighted_spawn_points:
 		if enhanced_gridmap:
-			# Reset the cell to its original state
-			var cell_item = enhanced_gridmap.get_cell_item(Vector3i(spawn_pos.x, 1, spawn_pos.y))
+			# Clear Layer 2 (Overlay Highlight) instead of potentially overwriting Layer 0
 			enhanced_gridmap.set_cell_item(
-				Vector3i(spawn_pos.x, 0, spawn_pos.y),
-				enhanced_gridmap.normal_items[0] if cell_item != -1 else -1
+				Vector3i(spawn_pos.x, 2, spawn_pos.y),
+				-1
 			)
 	
 	# Clear the array
@@ -1662,11 +1662,11 @@ func notify_spawn_selected(spawn_pos: Vector2i):
 	if spawn_pos in highlighted_spawn_points:
 		highlighted_spawn_points.erase(spawn_pos)
 		
-	# Clear highlight for the selected position
+	# Clear highlight for the selected position on Layer 2 (Overlay)
 	if enhanced_gridmap:
 		enhanced_gridmap.set_cell_item(
-			Vector3i(spawn_pos.x, 0, spawn_pos.y),
-			enhanced_gridmap.normal_items[0]
+			Vector3i(spawn_pos.x, 2, spawn_pos.y),
+			-1
 		)
 
 # Disabled, auto put activated
diff --git a/scripts/managers/player_action_manager.gd b/scripts/managers/player_action_manager.gd
index 7b3ba77..09a5dd6 100644
--- a/scripts/managers/player_action_manager.gd
+++ b/scripts/managers/player_action_manager.gd
@@ -105,7 +105,7 @@ func highlight_empty_adjacent_cells():
 	var current_cell = Vector3i(player.current_position.x, 1, player.current_position.y)
 	if enhanced_gridmap.get_cell_item(current_cell) == -1:
 		highlighted_cells.append(player.current_position)
-		enhanced_gridmap.set_cell_item(Vector3i(player.current_position.x, 0, player.current_position.y),
+		enhanced_gridmap.set_cell_item(Vector3i(player.current_position.x, 2, player.current_position.y),
 			enhanced_gridmap.hover_item)
 		print("Highlighted current position: ", player.current_position)
 	
@@ -117,7 +117,7 @@ func highlight_empty_adjacent_cells():
 			var cell = Vector3i(cell_pos.x, 1, cell_pos.y)
 			if enhanced_gridmap.get_cell_item(cell) == -1: # Check if cell is empty
 				highlighted_cells.append(cell_pos)
-				enhanced_gridmap.set_cell_item(Vector3i(cell_pos.x, 0, cell_pos.y),
+				enhanced_gridmap.set_cell_item(Vector3i(cell_pos.x, 2, cell_pos.y),
 					enhanced_gridmap.hover_item)
 				print("Highlighted adjacent cell: ", cell_pos)
 
@@ -132,7 +132,7 @@ func highlight_random_valid_cells():
 	var current_item = enhanced_gridmap.get_cell_item(current_cell)
 	if current_item != -1:
 		highlighted_cells.append(player.current_position)
-		enhanced_gridmap.set_cell_item(Vector3i(player.current_position.x, 0, player.current_position.y),
+		enhanced_gridmap.set_cell_item(Vector3i(player.current_position.x, 2, player.current_position.y),
 			enhanced_gridmap.hover_item)
 	
 	# Then check all adjacent cells for items
@@ -143,7 +143,7 @@ func highlight_random_valid_cells():
 			var cell = Vector3i(cell_pos.x, 1, cell_pos.y)
 			if enhanced_gridmap.get_cell_item(cell) != -1: # Only highlight cells with items
 				highlighted_cells.append(cell_pos)
-				enhanced_gridmap.set_cell_item(Vector3i(cell_pos.x, 0, cell_pos.y),
+				enhanced_gridmap.set_cell_item(Vector3i(cell_pos.x, 2, cell_pos.y),
 					enhanced_gridmap.hover_item)
 
 func highlight_occupied_playerboard_slots():
@@ -196,12 +196,6 @@ func clear_highlights():
 			# Safest is to check against hover_id or typical highlight IDs.
 			if l2_item != -1:
 				enhanced_gridmap.set_cell_item(l2_pos, -1)
-			
-			# Check Layer 0 (Floor Highlight)
-			var l0_pos = Vector3i(cell.x, 0, cell.y)
-			var l0_item = enhanced_gridmap.get_cell_item(l0_pos)
-			if l0_item == hover_id:
-				enhanced_gridmap.set_cell_item(l0_pos, enhanced_gridmap.normal_items[0])
 	
 	highlighted_cells.clear()
 
diff --git a/scripts/managers/stop_n_go_manager.gd b/scripts/managers/stop_n_go_manager.gd
index 0b0f3fc..1ff0812 100644
--- a/scripts/managers/stop_n_go_manager.gd
+++ b/scripts/managers/stop_n_go_manager.gd
@@ -21,6 +21,7 @@ var finish_line_x: int = 21 # Right side of the map for win condition
 
 # Tile IDs
 const TILE_WALKABLE = 0
+const TILE_START = 2 # Start Line
 const TILE_SAFE = 2 # Green Safe Zone
 const TILE_OBSTACLE = 4 # Wall
 
@@ -162,7 +163,9 @@ func sync_phase(phase_name: String, duration: float):
 	phase_timer = duration
 
 func _setup_arena():
-	var gridmap = get_node("/root/Main/EnhancedGridMap")
+	var gridmap = get_parent().get_node_or_null("EnhancedGridMap")
+	if not gridmap:
+		gridmap = get_node_or_null("/root/Main/EnhancedGridMap")
 	if not gridmap: return
 	
 	print("[StopNGo] Setting up 22x10 Arena with Randomized Obstacles...")
@@ -181,7 +184,10 @@ func sync_arena_setup():
 	
 func _apply_arena_setup():
 	# Shared logic for resizing and clearing
-	var gridmap = get_node("/root/Main/EnhancedGridMap")
+	var gridmap = get_parent().get_node_or_null("EnhancedGridMap")
+	if not gridmap:
+		# Fallback just in case
+		gridmap = get_node_or_null("/root/Main/EnhancedGridMap")
 	if not gridmap: return
 
 	# Set Size for Stop n Go explicitly, bypassing setters that wipe the map
@@ -197,7 +203,9 @@ func _apply_arena_setup():
 	# Create bands based on X (Horizontal Progress)
 	for x in range(gridmap.columns):
 		var tile_id = TILE_WALKABLE
-		if x in safe_columns:
+		if x == 0:
+			tile_id = TILE_START
+		elif x in safe_columns:
 			tile_id = TILE_SAFE
 		
 		for z in range(gridmap.rows):
@@ -251,7 +259,10 @@ func _apply_arena_setup():
 		# by sync_grid_item inside _spawn_mission_tiles.
 
 func _spawn_mission_tiles():
-	var gridmap = get_node("/root/Main/EnhancedGridMap")
+	var gridmap = get_parent().get_node_or_null("EnhancedGridMap")
+	if not gridmap:
+		gridmap = get_node_or_null("/root/Main/EnhancedGridMap")
+	if not gridmap: return
 	
 	# Tile IDs for missions: Heart(7), Diamond(8), Star(9), Coin(10)
 	var mission_tiles = [7, 8, 9, 10]
@@ -297,8 +308,9 @@ func sync_missions(missions: Dictionary):
 func check_movement_violation(player_id: int, from: Vector2i, to: Vector2i) -> bool:
 	"""Check if movement is illegal (during STOP phase and not in safe zone)."""
 	if current_phase == Phase.STOP:
-		var main = get_node("/root/Main")
-		var gridmap = main.get_node("EnhancedGridMap") if main else null
+		var gridmap = get_parent().get_node_or_null("EnhancedGridMap")
+		if not gridmap:
+			gridmap = get_node_or_null("/root/Main/EnhancedGridMap")
 		if gridmap:
 			# Check FROM position. If you were safe, you can move? 
 			# Rules: "If a player moves during this phase".