Make resource file for common map variables

1 files changed, 24 insertions, 16 deletions

diff --git a/scripts/cursor.gd b/scripts/cursor.gd
index 68e2010..7d9b00f 100644
--- a/scripts/cursor.gd
+++ b/scripts/cursor.gd
@@ -1,11 +1,11 @@
 extends Node2D
 
-@onready var grid_manager = get_node("../GridManager")
 @onready var tilemap = get_node("../Map/TileMapLayer")
+@onready var map_config = preload("res://resources/map_generator_resource.tres")
 
-var tile_size : float
-var max_x : float
-var max_y : float
+var occupied_tiles = {}
+var max_x : int
+var max_y : int
 
 var dirs = {"move_right": Vector2.RIGHT,
 			"move_left": Vector2.LEFT,
@@ -23,11 +23,10 @@ var towers : Dictionary = {
 }
 
 func _ready():
-	tile_size = grid_manager.tile_size
-	max_x = 20 * tile_size
-	max_y = 15 * tile_size
-	position = position.snapped(Vector2.ONE * tile_size)
-	position += Vector2(max_x / 2, max_y / 2) + Vector2(1, 0) * tile_size / 2
+	max_x = map_config.grid_width * map_config.tile_size
+	max_y = map_config.grid_height * map_config.tile_size
+	position = position.snapped(Vector2.ONE * map_config.tile_size)
+	position += Vector2.ONE * map_config.tile_size / 2
 
 func _unhandled_input(event):
 	for dir in dirs.keys():
@@ -46,16 +45,25 @@ func handle_tower(tower):
 		var path = get_tree().get_root().get_node("Main/Defenders")
 		path.add_child(tmp)
 		tmp.global_position = position
-		grid_manager.occupy_tile(position)
+		occupy_tile(position)
 		GameData.subtract_life(tower_cost)
 
 func handle_move(dir):
-	position += dir * tile_size
-	position.x = max(position.x, tile_size / 2)
-	position.y = max(position.y, tile_size / 2)
-	position.x = min(position.x, max_x - (tile_size / 2))
-	position.y = min(position.y, max_y - tile_size - (tile_size / 2))
+	position += dir * map_config.tile_size
+	position.x = max(position.x, map_config.tile_size / 2)
+	position.y = max(position.y, map_config.tile_size / 2)
+	position.x = min(position.x, max_x - (map_config.tile_size / 2))
+	position.y = min(position.y, max_y - map_config.tile_size - (map_config.tile_size / 2))
 
 func is_valid_placement_tile():
 	var tile_coords = tilemap.get_cell_atlas_coords(tilemap.local_to_map(global_position))
-	return (tile_coords == (Vector2i(-1, -1))) && (!grid_manager.is_tile_occupied(position))
+	return (tile_coords == (Vector2i(-1, -1))) && (!is_tile_occupied(position))
+	
+func is_tile_occupied(tile_position):
+	return occupied_tiles.has(tile_position)
+
+func occupy_tile(tile_position):
+	occupied_tiles[tile_position] = true
+
+func free_tile(tile_position):
+	occupied_tiles.erase(tile_position)