diff options
| -rw-r--r-- | resources/map_generator_resource.tres | 7 | ||||
| -rw-r--r-- | scenes/Main.tscn | 22 | ||||
| -rw-r--r-- | scripts/cursor.gd | 40 | ||||
| -rw-r--r-- | scripts/grid_manager.gd | 16 | ||||
| -rw-r--r-- | scripts/grid_manager.gd.uid | 1 | ||||
| -rw-r--r-- | scripts/map_generator.gd | 25 | ||||
| -rw-r--r-- | scripts/map_generator_resource.gd | 34 | ||||
| -rw-r--r-- | scripts/map_generator_resource.gd.uid | 1 | ||||
| -rw-r--r-- | scripts/path_generator.gd | 15 | ||||
| -rw-r--r-- | scripts/wave_spawner.gd | 3 |
10 files changed, 102 insertions, 62 deletions
diff --git a/resources/map_generator_resource.tres b/resources/map_generator_resource.tres new file mode 100644 index 0000000..f767c1c --- /dev/null +++ b/resources/map_generator_resource.tres @@ -0,0 +1,7 @@ +[gd_resource type="Resource" load_steps=2 format=3 uid="uid://cdqqg7ni517ol"] + +[ext_resource type="Script" uid="uid://bsc3qt5tyv2fc" path="res://scripts/map_generator_resource.gd" id="1_xlatm"] + +[resource] +script = ExtResource("1_xlatm") +metadata/_custom_type_script = "uid://bsc3qt5tyv2fc" diff --git a/scenes/Main.tscn b/scenes/Main.tscn index 996f4bd..78deb34 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -3,9 +3,27 @@ [ext_resource type="Script" uid="uid://i5bjnah05h14" path="res://scripts/wave_spawner.gd" id="2_0bbpv"] [ext_resource type="PackedScene" uid="uid://cdgeamr56c0mx" path="res://scenes/map.tscn" id="2_vcsgt"] [ext_resource type="PackedScene" uid="uid://cq6d7gmjbwl14" path="res://scenes/cursor.tscn" id="4_rarhs"] -[ext_resource type="Script" uid="uid://c8p74tnba8rs8" path="res://scripts/grid_manager.gd" id="4_vcsgt"] [ext_resource type="PackedScene" uid="uid://dycgp3yept14k" path="res://scenes/ui.tscn" id="5_vcsgt"] +[sub_resource type="GDScript" id="GDScript_rarhs"] +script/source = "extends Node + +var occupied_tiles = {} + +@export var tile_size = 16.0 +@export var grid_width = 20 +@export var grid_height = 15 + +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) +" + [node name="Main" type="Node2D"] [node name="Cursor" parent="." instance=ExtResource("4_rarhs")] @@ -22,7 +40,7 @@ autostart = true [node name="Defenders" type="Node" parent="."] [node name="GridManager" type="Node" parent="."] -script = ExtResource("4_vcsgt") +script = SubResource("GDScript_rarhs") [node name="PanelContainer" parent="." instance=ExtResource("5_vcsgt")] offset_top = 224.0 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) diff --git a/scripts/grid_manager.gd b/scripts/grid_manager.gd deleted file mode 100644 index 8fa59e5..0000000 --- a/scripts/grid_manager.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends Node - -var occupied_tiles = {} - -@export var tile_size = 16.0 -@export var grid_width = 20 -@export var grid_height = 15 - -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) diff --git a/scripts/grid_manager.gd.uid b/scripts/grid_manager.gd.uid deleted file mode 100644 index 424fc40..0000000 --- a/scripts/grid_manager.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c8p74tnba8rs8 diff --git a/scripts/map_generator.gd b/scripts/map_generator.gd index 7feb4b7..4ef2aa5 100644 --- a/scripts/map_generator.gd +++ b/scripts/map_generator.gd @@ -1,14 +1,7 @@ extends Node2D -@export var grid_width : int = 20 -@export var grid_height : int = 14 -@export var tile_size : int = 16 - @onready var tile_map : TileMapLayer = $TileMapLayer - -var _path_straight_atlas_coords : Vector2i = Vector2i(8, 1) -var _path_corner_atlas_coords : Vector2i = Vector2i(9, 1) -var _path_empty_atlas_coords : Vector2i = Vector2i(0, 0) +@onready var map_config : MapGeneratorResource = preload("res://resources/map_generator_resource.tres") var _path : Array[Vector2i] @@ -24,7 +17,7 @@ func _ready() -> void: _draw_path() func _generate_path(): - var pg : PathGenerator = PathGenerator.new(grid_width, grid_height) + var pg : PathGenerator = PathGenerator.new() _path = [] while _path.size() < 35: _path = pg.generate_path() @@ -34,25 +27,25 @@ func _draw_path(): for i in _path: var score : int = _get_tile_score(_path, i) - var atlas_coords : Vector2i = _path_empty_atlas_coords + var atlas_coords : Vector2i = map_config.path_empty_atlas_coords var rot : TileTransform = TileTransform.ROTATE_0 match score: 2, 8, 10: - atlas_coords = _path_straight_atlas_coords + atlas_coords = map_config.path_straight_atlas_coords rot = TileTransform.ROTATE_90 1, 4, 5: - atlas_coords = _path_straight_atlas_coords + atlas_coords = map_config.path_straight_atlas_coords 3: - atlas_coords = _path_corner_atlas_coords + atlas_coords = map_config.path_corner_atlas_coords rot = TileTransform.ROTATE_270 6: - atlas_coords = _path_corner_atlas_coords + atlas_coords = map_config.path_corner_atlas_coords 12: - atlas_coords = _path_corner_atlas_coords + atlas_coords = map_config.path_corner_atlas_coords rot = TileTransform.ROTATE_90 9: - atlas_coords = _path_corner_atlas_coords + atlas_coords = map_config.path_corner_atlas_coords rot = TileTransform.ROTATE_180 _display_tile(atlas_coords, rot, i) diff --git a/scripts/map_generator_resource.gd b/scripts/map_generator_resource.gd new file mode 100644 index 0000000..9bd8a57 --- /dev/null +++ b/scripts/map_generator_resource.gd @@ -0,0 +1,34 @@ +extends Resource +class_name MapGeneratorResource + +@export var grid_width : int = 20 +@export var grid_height : int = 15 +@export var tile_size : int = 16 +@export var min_path_size : int = 45 + +var path_straight_atlas_coords : Vector2i = Vector2i(8, 1) +var path_corner_atlas_coords : Vector2i = Vector2i(9, 1) +var path_empty_atlas_coords : Vector2i = Vector2i(0, 0) + +var water_middle_atlas_coords : Vector2i = Vector2i(8, 5) +var water_shore_atlas_coords : Vector2i = Vector2i(9, 5) +var water_bend_outer_atlas_coords : Vector2i = Vector2i(10, 5) +var water_bend_inner_atlas_coords : Vector2i = Vector2i(11, 5) + +var obstruction_one_atlas_coords : Vector2i = Vector2i(18, 6) # dead trees +var obstruction_two_atlas_coords : Vector2i = Vector2i(19, 6) +var obstruction_three_atlas_coords : Vector2i = Vector2i(20, 6) + +var obstruction_four_atlas_coords : Vector2i = Vector2i(0, 1) # living trees +var obstruction_five_atlas_coords : Vector2i = Vector2i(1, 1) +var obstruction_six_atlas_coords : Vector2i = Vector2i(2, 1) +var obstruction_seven_atlas_coords : Vector2i = Vector2i(3, 1) +var obstruction_eight_atlas_coords : Vector2i = Vector2i(4, 1) +var obstruction_nine_atlas_coords : Vector2i = Vector2i(3, 2) + +var obstruction_ten_atlas_coords : Vector2i = Vector2i(0, 2) # grass +var obstruction_eleven_atlas_coords : Vector2i = Vector2i(1, 2) +var obstruction_twelve_atlas_coords : Vector2i = Vector2i(2, 2) + +var obstruction_thirteen_atlas_coords : Vector2i = Vector2i(5, 2) # rocks, bushes +var obstruction_fourteen_atlas_coords : Vector2i = Vector2i(6, 2) diff --git a/scripts/map_generator_resource.gd.uid b/scripts/map_generator_resource.gd.uid new file mode 100644 index 0000000..5486c71 --- /dev/null +++ b/scripts/map_generator_resource.gd.uid @@ -0,0 +1 @@ +uid://bsc3qt5tyv2fc diff --git a/scripts/path_generator.gd b/scripts/path_generator.gd index 87fedc3..cf48175 100644 --- a/scripts/path_generator.gd +++ b/scripts/path_generator.gd @@ -2,29 +2,24 @@ extends Object class_name PathGenerator -var _grid_width : int -var _grid_height : int - -func _init(width:int, height:int): - _grid_width = width - _grid_height = height +var map_config : MapGeneratorResource = preload("res://resources/map_generator_resource.tres") func generate_path() -> Array[Vector2i]: var path : Array[Vector2i] var x : int = 0 - var y : int = randi_range(1, _grid_height-2) + var y : int = randi_range(1, map_config.grid_height - 3) - while x < _grid_width: + while x < map_config.grid_width: if not path.has(Vector2i(x,y)): path.append(Vector2i(x, y)) var choice : int = randi_range(0,2) # every even tile goes right to leave room for towers - if choice == 0 || x % 2 == 0 || x == _grid_width - 1: + if choice == 0 || x % 2 == 0 || x == map_config.grid_width - 1: x += 1 - elif choice == 1 && y < _grid_height - 2 && !path.has(Vector2i(x, y + 1)): + elif choice == 1 && y < map_config.grid_height - 3 && !path.has(Vector2i(x, y + 1)): y += 1 elif choice == 2 && y > 1 && !path.has(Vector2i(x, y - 1)): y -= 1 diff --git a/scripts/wave_spawner.gd b/scripts/wave_spawner.gd index 3f63c71..7c54dfc 100644 --- a/scripts/wave_spawner.gd +++ b/scripts/wave_spawner.gd @@ -1,5 +1,6 @@ extends Node2D +@onready var map_config = preload("res://resources/map_generator_resource.tres") @onready var fodder_enemy = preload("res://scenes/soldier.tscn") @onready var map = get_node("../Map") @@ -16,7 +17,7 @@ func _ready() -> void: # adjust to grid size for i in map.get_enemy_path(): - curve.add_point(i * 16 + Vector2i.ONE * 8) + curve.add_point(i * map_config.tile_size + Vector2i.ONE * (map_config.tile_size / 2)) func _on_timer_timeout(): var path = Path2D.new() |