diff options
Diffstat (limited to 'Game')
39 files changed, 480 insertions, 220 deletions
diff --git a/Game/Client.gd b/Game/Client.gd index 6e08a58..71f1fc1 100644 --- a/Game/Client.gd +++ b/Game/Client.gd @@ -1,8 +1,6 @@ extends Node -signal stage_state_changed(state: State) - @warning_ignore("unused_signal") signal placed_tower(tower: Tower) @@ -11,15 +9,8 @@ signal multi_select_finished(nodes) var previous_scene: String -var state: State : - set(value): - state = value - stage_state_changed.emit(value) - var current_stage: Stage -var selection: SelectionManager - var player: Player: get(): return Network.get_player(multiplayer.get_unique_id()) @@ -35,8 +26,7 @@ func initialize_stage(stage: Stage): current_stage = stage func ready_stage(_stage: Stage): - selection = preload("res://Game/Selection/SelectionManager.tscn").instantiate() - add_child(selection) + pass func place_tower(tower: Tower): @@ -67,9 +57,9 @@ func select_tower(tower: Tower): tower.is_selected = true -func multi_select(layer: int): +func multi_select(collision_mask: int): var selection_area = preload("res://Game/Selection/MultiSelectArea.tscn").instantiate() - selection_area.set_collision_mask_value(layer, true) + selection_area.collision_mask = collision_mask selection_area.select.connect(func(nodes): for node in nodes: Client.select_tower(node) @@ -118,7 +108,7 @@ func get_config() -> ConfigFile: config.load("user://config") if not FileAccess.file_exists("user://config"): - config.set_value("general", "host_default_port", 1234) + config.set_value("general", "host_default_port", 8911) config.set_value("general", "game_lobby_server_base_url", "http://localhost:8910") config.save("user://config") diff --git a/Game/Client.gd.uid b/Game/Client.gd.uid new file mode 100644 index 0000000..7b0a276 --- /dev/null +++ b/Game/Client.gd.uid @@ -0,0 +1 @@ +uid://beg2nd05y1cmr diff --git a/Game/Client.tscn b/Game/Client.tscn index db2a8b2..ca60eba 100644 --- a/Game/Client.tscn +++ b/Game/Client.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://uf2qebewyohd"] -[ext_resource type="Script" path="res://Game/Client.gd" id="1_kj0qy"] +[ext_resource type="Script" uid="uid://beg2nd05y1cmr" path="res://Game/Client.gd" id="1_kj0qy"] [node name="Client" type="Node"] script = ExtResource("1_kj0qy") diff --git a/Game/Lobby/Server/index.php b/Game/Lobby/Server/index.php index ae734a6..7d12195 100644 --- a/Game/Lobby/Server/index.php +++ b/Game/Lobby/Server/index.php @@ -19,101 +19,104 @@ $db = new PDO('sqlite:./' . $dbname, options: [ if (php_sapi_name() == 'cli') { if ($argv[$argc - 1] == 'init-db') { - $db->query(<<<SQL - create table if not exists games ( - id text primary key, - ip text unique, - port integer, - creation_time integer, - ping_time integer, - name text, - secret text - ); - SQL) - ->execute(); + $db->query(<<<SQL + create table if not exists games ( + id text primary key, + ip text unique, + port integer, + creation_time integer, + ping_time integer, + name text, + secret text + ); + SQL) + ->execute(); } return; } -$url = parse_url("$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); +$url = parse_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"); $method = $_SERVER['REQUEST_METHOD']; if ($method == 'POST') { $inputPost = json_decode(file_get_contents('php://input'), true); if ($inputPost) { - $_POST = $inputPost + $_POST; + $_POST = $inputPost + $_POST; } } $response = []; if ($method == 'POST' && $url['path'] == '/host') { - $ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP); + $ip = filter_var( + $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'], + FILTER_VALIDATE_IP + ); if ($ip === false) { - $response = [ - 'success' => false, - 'error' => 'Invalid IP.', - ]; + $response = [ + 'success' => false, + 'error' => 'Invalid IP.', + ]; } else { - $port = intval($_POST['port']); - $name = $_POST['name']; - $id = md5($name . time()); - $secret = md5($id . random_bytes($port)); - - $success = $db->prepare(<<<SQL - insert or replace into games (id, ip, port, creation_time, ping_time, name, secret) values (:id, :ip, :port, :timestamp, :timestamp, :name, :secret) - SQL) - ->execute([ - 'id' => $id, - 'ip' => $ip, - 'port' => $port, - 'timestamp' => time(), - 'name' => $name, - 'secret' => $secret, - ]); - - if ($success) { - $response = [ - 'success' => $success, - 'data' => [ - 'id' => $id, - 'secret' => $secret, - ], - ]; - } else { - $response = [ - 'success' => $success, - 'error' => $db->errorInfo(), - ]; - } + $port = intval($_POST['port']); + $name = $_POST['name']; + $id = md5($name . time()); + $secret = md5($id . random_bytes($port)); + + $success = $db->prepare(<<<SQL + insert or replace into games (id, ip, port, creation_time, ping_time, name, secret) values (:id, :ip, :port, :timestamp, :timestamp, :name, :secret) + SQL) + ->execute([ + 'id' => $id, + 'ip' => $ip, + 'port' => $port, + 'timestamp' => time(), + 'name' => $name, + 'secret' => $secret, + ]); + + if ($success) { + $response = [ + 'success' => $success, + 'data' => [ + 'id' => $id, + 'secret' => $secret, + ], + ]; + } else { + $response = [ + 'success' => $success, + 'error' => $db->errorInfo(), + ]; + } } } else if ($method == 'GET' && $url['path'] == '/get-list') { $statement = $db->prepare(<<<SQL - select id, name from games - where ping_time > :comparison_time - SQL); + select id, name from games + where ping_time > :comparison_time + SQL); $statement->execute([ - 'comparison_time' => time() - $timeoutMax, + 'comparison_time' => time() - $timeoutMax, ]); $results = $statement->fetchAll(); $list = []; foreach ($results as $row) { - $list[] = [ - 'id' => $row['id'], - 'name' => $row['name'], - ]; + $list[] = [ + 'id' => $row['id'], + 'name' => $row['name'], + ]; } $response = [ - 'success' => true, - 'data' => $list, + 'success' => true, + 'data' => $list, ]; } @@ -121,30 +124,30 @@ else if ($method == 'GET' && $url['path'] == '/join') { $id = $_GET['id']; $statement = $db->prepare(<<<SQL - select ip, port from games - where id = :id - SQL); + select ip, port from games + where id = :id + SQL); $statement->execute([ - 'id' => $id, + 'id' => $id, ]); $result = $statement->fetch(); if ($result === false) { - $response = [ - 'success' => false, - 'error' => 'Game not found.' - ]; - http_response_code(404); + $response = [ + 'success' => false, + 'error' => 'Game not found.' + ]; + http_response_code(404); } else { - $response = [ - 'success' => true, - 'data' => [ - 'ip' => $result['ip'], - 'port' => $result['port'], - ], - ]; + $response = [ + 'success' => true, + 'data' => [ + 'ip' => $result['ip'], + 'port' => $result['port'], + ], + ]; } } @@ -153,15 +156,15 @@ else if ($method == 'POST' && $url['path'] == '/close') { $secret = $_POST['secret']; $success = $db->prepare(<<<SQL - delete from games where id = :id and secret = :secret - SQL) - ->execute([ - 'id' => $id, - 'secret' => $secret, - ]); + delete from games where id = :id and secret = :secret + SQL) + ->execute([ + 'id' => $id, + 'secret' => $secret, + ]); $response = [ - 'success' => $success, + 'success' => $success, ]; } @@ -170,23 +173,23 @@ else if ($method == 'POST' && $url['path'] == '/keep-alive') { $secret = $_POST['secret']; $success = $db->prepare(<<<SQL - update games set ping_time = :ping_time where id = :id and secret = :secret - SQL) - ->execute([ - 'id' => $id, - 'secret' => $secret, - 'ping_time' => time(), - ]); + update games set ping_time = :ping_time where id = :id and secret = :secret + SQL) + ->execute([ + 'id' => $id, + 'secret' => $secret, + 'ping_time' => time(), + ]); $response = [ - 'success' => $success, + 'success' => $success, ]; } else { $response = [ - 'success' => false, - 'error' => 'Route not found.' + 'success' => false, + 'error' => 'Route not found.' ]; http_response_code(404); } diff --git a/Game/Lobby/game_lobby.gd b/Game/Lobby/games_lobby.gd index 6bfa8be..3d54059 100644 --- a/Game/Lobby/game_lobby.gd +++ b/Game/Lobby/games_lobby.gd @@ -1,7 +1,7 @@ extends Node -class HTTPRequestConfig extends Resource: +class HTTPRequestConfig: var headers: PackedStringArray var method: HTTPClient.Method var data: Dictionary @@ -20,7 +20,7 @@ class HTTPRequestConfig extends Resource: self.node = node -class HTTPResponse extends Resource: +class HTTPResponse: var result_code: HTTPRequest.Result var response_code: int var headers: PackedStringArray @@ -42,8 +42,8 @@ func request( get_tree().root.add_child(config.node) if config.method == HTTPClient.METHOD_POST: - config.set("id", current_game_id) - config.set("secret", current_secret) + config.data["id"] = current_game_id + config.data["secret"] = current_secret var response = HTTPResponse.new() config.node.request_completed.connect( @@ -60,6 +60,7 @@ func request( get_tree().root.remove_child(config.node) ) + config.node.request( "%s%s" % [server_base_url, url], config.headers, @@ -71,19 +72,19 @@ func request( return response -func request_get(url: String, headers := PackedStringArray()): +func request_get(url: String, headers := PackedStringArray()) -> HTTPResponse: var config := HTTPRequestConfig.new(headers) return await request(url, config) -func request_post(url: String, data: Dictionary = {}, headers := PackedStringArray()): +func request_post(url: String, data: Dictionary = {}, headers := PackedStringArray()) -> HTTPResponse: var config := HTTPRequestConfig.new(headers, HTTPClient.METHOD_POST, data) return await request(url, config) func check_available() -> bool: - var response = await GameLobby.request_get("") + var response := await GameLobby.request_get("") return response.result_code == HTTPRequest.RESULT_SUCCESS diff --git a/Game/Lobby/games_lobby.gd.uid b/Game/Lobby/games_lobby.gd.uid new file mode 100644 index 0000000..02c3529 --- /dev/null +++ b/Game/Lobby/games_lobby.gd.uid @@ -0,0 +1 @@ +uid://di71agk265b8k diff --git a/Game/Network.gd b/Game/Network.gd index 2858d98..345b305 100644 --- a/Game/Network.gd +++ b/Game/Network.gd @@ -61,13 +61,7 @@ func _on_disconnected_from_server(): func _on_peer_connected(id: int): print(multiplayer.get_unique_id(), ": peer connected: ", id) - ask_game_running.rpc_id(id) - is_game_running.connect(func(is_running: bool): - if not is_running: - add_to_players.rpc_id(id, inst_to_dict(Client.player)) - elif is_running: - get_tree().change_scene_to_file("res://UI/Start.tscn") - ) + add_to_players.rpc_id(id, inst_to_dict(Client.player)) func _on_peer_disconnected(id: int): print(multiplayer.get_unique_id(), ": peer disconnected: ", id) @@ -111,18 +105,6 @@ func remove_player(id: int): players_changed.emit() -signal is_game_running(is_running: bool) - -@rpc("any_peer") -func ask_game_running(): - var is_running = get_tree().current_scene is Stage - receive_game_running.rpc_id(multiplayer.get_remote_sender_id(), is_running) - -@rpc("any_peer") -func receive_game_running(is_running: bool): - is_game_running.emit(is_running) - - @rpc("any_peer") func add_to_players(remote_data: Dictionary): var id = multiplayer.get_remote_sender_id() @@ -150,7 +132,7 @@ func update_player(id: int, remote_data: Dictionary): players_changed.emit() -@rpc("any_peer") +@rpc("any_peer", "call_remote") func destroy_tower(remote_data: Dictionary): var data: Tower.NetworkData = dict_to_inst(remote_data) var remote_tower = Tower.from_network_data(data) @@ -161,7 +143,7 @@ func destroy_tower(remote_data: Dictionary): Client.current_stage.destroy_tower(tower) -@rpc("any_peer") +@rpc("any_peer", "call_remote") func update_tower(remote_tower_node_path: NodePath, remote_data: Dictionary): var data: Tower.NetworkData = dict_to_inst(remote_data) var tower: Tower = get_tree().current_scene.get_node_or_null(remote_tower_node_path) @@ -170,14 +152,14 @@ func update_tower(remote_tower_node_path: NodePath, remote_data: Dictionary): tower.update_with_network_data(data) -@rpc("any_peer") +@rpc("any_peer", "call_remote") func remove_unit(remote_unit_node_path: NodePath): var unit = get_tree().current_scene.get_node_or_null(remote_unit_node_path) if unit: unit.queue_free() -@rpc("any_peer") +@rpc("any_peer", "call_remote") func update_unit(remote_unit_node_path: NodePath, remote_data: Dictionary): var data: Unit.NetworkData = dict_to_inst(remote_data) var unit: Unit = get_tree().current_scene.get_node_or_null(remote_unit_node_path) diff --git a/Game/Network.gd.uid b/Game/Network.gd.uid new file mode 100644 index 0000000..d0993ba --- /dev/null +++ b/Game/Network.gd.uid @@ -0,0 +1 @@ +uid://dl5ac0b3bcdwq diff --git a/Game/Network.tscn b/Game/Network.tscn index 4b6159b..2f60876 100644 --- a/Game/Network.tscn +++ b/Game/Network.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dknyh6isiv5w4"] -[ext_resource type="Script" path="res://Game/Network.gd" id="1_p1jvi"] +[ext_resource type="Script" uid="uid://dl5ac0b3bcdwq" path="res://Game/Network.gd" id="1_p1jvi"] [node name="Network" type="Node"] script = ExtResource("1_p1jvi") diff --git a/Game/Player.gd.uid b/Game/Player.gd.uid new file mode 100644 index 0000000..848fda3 --- /dev/null +++ b/Game/Player.gd.uid @@ -0,0 +1 @@ +uid://dgk8fyrvo4y30 diff --git a/Game/Player.tscn b/Game/Player.tscn index 23faa6e..b321671 100644 --- a/Game/Player.tscn +++ b/Game/Player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://fvspuiqj0osm"] -[ext_resource type="Script" path="res://Game/Player.gd" id="1_37njm"] +[ext_resource type="Script" uid="uid://dgk8fyrvo4y30" path="res://Game/Player.gd" id="1_37njm"] [node name="Player" type="Node"] script = ExtResource("1_37njm") diff --git a/Game/Selection/MultiSelectArea.tscn b/Game/Selection/MultiSelectArea.tscn index 9e6bd43..8fe9455 100644 --- a/Game/Selection/MultiSelectArea.tscn +++ b/Game/Selection/MultiSelectArea.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bmi8eb80wghjs"] -[ext_resource type="Script" path="res://Game/Selection/multi_select_area.gd" id="1_g76x3"] +[ext_resource type="Script" uid="uid://da81dgensk8is" path="res://Game/Selection/multi_select_area.gd" id="1_g76x3"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_8io84"] diff --git a/Game/Selection/SelectableArea.tscn b/Game/Selection/SelectableArea.tscn index 3f64dec..77d1ab9 100644 --- a/Game/Selection/SelectableArea.tscn +++ b/Game/Selection/SelectableArea.tscn @@ -1,14 +1,20 @@ [gd_scene load_steps=2 format=3 uid="uid://cqktpc8c7ecn3"] -[ext_resource type="Script" path="res://Game/Selection/selectable_area.gd" id="1_8w2y0"] +[ext_resource type="Script" uid="uid://dswexnxms07hn" path="res://Game/Selection/selectable_area.gd" id="1_8w2y0"] [node name="SelectableArea" type="Area2D"] collision_layer = 32 collision_mask = 16 script = ExtResource("1_8w2y0") -[connection signal="area_entered" from="." to="." method="_on_area_entered"] -[connection signal="area_exited" from="." to="." method="_on_area_exited"] +[node name="HoverControl" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 +mouse_filter = 1 +mouse_default_cursor_shape = 2 + [connection signal="input_event" from="." to="." method="_on_input_event"] [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"] diff --git a/Game/Selection/SelectionManager.gd b/Game/Selection/SelectionManager.gd index 49cb319..7ea98ff 100644 --- a/Game/Selection/SelectionManager.gd +++ b/Game/Selection/SelectionManager.gd @@ -2,29 +2,166 @@ class_name SelectionManager extends Node -var selection_groups := {} +signal added_to_group(nodes: Array[Node], id: String) +signal removed_from_group(nodes: Array[Node], id: String) +signal moved_to_group(nodes: Array[Node], previous_id: String, new_id: String) -signal selected_group_changed +var selection_groups: Dictionary[String, Array] = {} + +signal selected_group_changed(previous_id: String, new_id: String) var selected_group := "": set(value): + var previous_id := selected_group selected_group = value - selected_group_changed.emit() + selected_group_changed.emit(previous_id, value) + +var node_count: int func _ready() -> void: - pass + Client.multi_select_finished.connect(_on_multi_select_finished) + Client.placed_tower.connect(_on_placed_tower) + + +func add_to_selection_group(nodes: Array[Node], id: String) -> void: + if id not in selection_groups: + selection_groups[id] = [] + + selection_groups[id].append_array(nodes) + node_count += nodes.size() + + if not selected_group: + reset_selected_group() + + added_to_group.emit(nodes, id) -func change_selection_group_id(towers: Array[Tower], previous_id: String, new_id: String) -> void: - if new_id not in selection_groups: - selection_groups[new_id] = [] +func remove_from_selection_group(nodes: Array[Node], id: String, fallback_id: String = "") -> void: + for node in nodes: + selection_groups[id].erase(node) + + if selection_groups[id].is_empty(): + selection_groups.erase(id) + if id == selected_group: + if fallback_id and selection_groups.has(fallback_id): + selected_group = fallback_id + else: + reset_selected_group() - selection_groups[new_id].append_array(towers) + node_count -= nodes.size() + removed_from_group.emit(nodes, id) + + +func move_to_selection_group(nodes: Array[Node], previous_id: String, new_id: String) -> void: + remove_from_selection_group(nodes, previous_id, new_id) + add_to_selection_group(nodes, new_id) + moved_to_group.emit(nodes, previous_id, new_id) + + +func get_ordered_group_ids() -> Array[String]: + var keys = selection_groups.keys() + + keys.sort_custom(func(a, b): + var group_a = selection_groups[a] + var group_b = selection_groups[b] + + return group_a.size() > group_b.size() + ) + + # TODO: also sort in units and make node type checks + + keys.sort_custom(func(a, b): + var group_a = selection_groups[a] + var group_b = selection_groups[b] + var node_a = group_a[0] + var node_b = group_b[0] + var level_a = 0 + var level_b = 0 + + for component in node_a.components.values(): + level_a += component.level + for component in node_b.components.values(): + level_b += component.level + + return level_a > level_b + ) + + keys.sort_custom(func(a, b): + var group_a = selection_groups[a] + var group_b = selection_groups[b] + + return group_a[0].components.size() > group_b[0].components.size() + ) + + return keys as Array[String] + + +func get_selected_nodes() -> Array: + if selected_group: + return selection_groups[selected_group] - for tower in towers: - selection_groups[previous_id].erase(tower) + return [] + + +func get_nodes() -> Array: + var nodes := [] + for id in selection_groups: + nodes.append_array(selection_groups[id]) - if selection_groups[previous_id].is_empty(): - selection_groups.erase(previous_id) - if previous_id == selected_group: - selected_group = new_id + return nodes + + +func go_to_next(): + var ids = get_ordered_group_ids() + var current_idx = ids.find(selected_group) + selected_group = ids[(current_idx + 1) % ids.size()] + + +func go_to_previous(): + var ids = get_ordered_group_ids() + var current_idx = ids.find(selected_group) + selected_group = ids[(current_idx - 1) % ids.size()] + + +func has_selection() -> bool: + return selection_groups.size() > 0 + + +func has_node_in_group(node: Node, id: String) -> bool: + return selection_groups.has(id) and selection_groups[id].has(node) + + +func reset_selected_group(): + var ids = get_ordered_group_ids() + if ids.size() > 0: + selected_group = ids[0] + else: + selected_group = "" + + +func _on_multi_select_finished(_nodes: Array): + #add_to_selection_group(nodes) + reset_selected_group() + + +func _on_placed_tower(tower: Tower): + if tower.owner_id == multiplayer.get_unique_id(): + tower.selected.connect(func(): + _on_selected_tower(tower) + ) + tower.deselected.connect(func(): + _on_deselected_tower(tower) + ) + tower.selection_group_id_changed.connect(func(previous_id: String): + _on_tower_selection_group_id_changed(tower, previous_id) + ) + +func _on_selected_tower(tower: Tower): + if not has_node_in_group(tower, tower.selection_group_id): + add_to_selection_group([tower], tower.selection_group_id) + +func _on_deselected_tower(tower: Tower): + remove_from_selection_group([tower], tower.selection_group_id) + +func _on_tower_selection_group_id_changed(tower: Tower, previous_id: String): + move_to_selection_group([tower], previous_id, tower.selection_group_id) diff --git a/Game/Selection/SelectionManager.gd.uid b/Game/Selection/SelectionManager.gd.uid new file mode 100644 index 0000000..995c5a5 --- /dev/null +++ b/Game/Selection/SelectionManager.gd.uid @@ -0,0 +1 @@ +uid://cxd3b8dhdrdq diff --git a/Game/Selection/SelectionManager.tscn b/Game/Selection/SelectionManager.tscn index e89880f..a4a7ed5 100644 --- a/Game/Selection/SelectionManager.tscn +++ b/Game/Selection/SelectionManager.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://mgm4npqeybbr"] -[ext_resource type="Script" path="res://Game/Selection/SelectionManager.gd" id="1_1w5l7"] +[ext_resource type="Script" uid="uid://cxd3b8dhdrdq" path="res://Game/Selection/SelectionManager.gd" id="1_1w5l7"] [node name="SelectionManager" type="Node"] script = ExtResource("1_1w5l7") diff --git a/Game/Selection/SelectionRectangle.tscn b/Game/Selection/SelectionRectangle.tscn index 61517d0..c687bf5 100644 --- a/Game/Selection/SelectionRectangle.tscn +++ b/Game/Selection/SelectionRectangle.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://ic2hc7gr27p3"] -[ext_resource type="Script" path="res://Game/Selection/selection_rectangle.gd" id="1_on0pa"] +[ext_resource type="Script" uid="uid://cku2w6lsd5ylc" path="res://Game/Selection/selection_rectangle.gd" id="1_on0pa"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_nq6xv"] size = Vector2(1, 1) diff --git a/Game/Selection/multi_select_area.gd.uid b/Game/Selection/multi_select_area.gd.uid new file mode 100644 index 0000000..e305d03 --- /dev/null +++ b/Game/Selection/multi_select_area.gd.uid @@ -0,0 +1 @@ +uid://da81dgensk8is diff --git a/Game/Selection/selectable_area.gd b/Game/Selection/selectable_area.gd index 0b3557d..e611835 100644 --- a/Game/Selection/selectable_area.gd +++ b/Game/Selection/selectable_area.gd @@ -1,3 +1,4 @@ +class_name SelectableArea extends Area2D @@ -7,23 +8,22 @@ signal hover_exit signal select_primary(event: InputEvent) signal select_secondary(event: InputEvent) +@export var root: Node2D -#func _on_area_entered(_area: Area2D) -> void: - #hover_enter.emit() -# -# -#func _on_area_exited(_area: Area2D) -> void: - #hover_exit.emit() + +func _ready() -> void: + var cshapes := find_children("*", "CollisionShape2D") + assert(cshapes.size() > 0) + assert(cshapes[0].shape is RectangleShape2D) + $HoverControl.size = cshapes[0].shape.size func _on_mouse_entered() -> void: - if not get_tree().get_first_node_in_group("selection_rectangle").is_active: - hover_enter.emit() + hover_enter.emit() func _on_mouse_exited() -> void: - if not get_tree().get_first_node_in_group("selection_rectangle").is_active: - hover_exit.emit() + hover_exit.emit() func _on_input_event(_viewport: Node, event: InputEvent, _shape_idx: int) -> void: diff --git a/Game/Selection/selectable_area.gd.uid b/Game/Selection/selectable_area.gd.uid new file mode 100644 index 0000000..e8bc17d --- /dev/null +++ b/Game/Selection/selectable_area.gd.uid @@ -0,0 +1 @@ +uid://dswexnxms07hn diff --git a/Game/Selection/selection_rectangle.gd b/Game/Selection/selection_rectangle.gd index b643636..1d1590a 100644 --- a/Game/Selection/selection_rectangle.gd +++ b/Game/Selection/selection_rectangle.gd @@ -1,20 +1,25 @@ extends Area2D +signal hover_entered(node: Node2D) +signal hover_exited(node: Node2D) + @export_group("Color", "color") @export var color_background: Color @export var color_border: Color +@export var is_enabled: bool + var anchor: Vector2 = Vector2.ZERO -var size: Vector2 = Vector2.ZERO : +var size: Vector2 = Vector2.ZERO: set(value): size = value $CollisionShape2D.position = size / 2 $CollisionShape2D.shape.size = abs(size) -var is_active: bool : +var is_active: bool: get(): - return abs(size) > Vector2(1, 1) and Client.state is StateDefault + return abs(size) > Vector2(1, 1) and is_enabled @onready var camera: Camera = get_viewport().get_camera_2d() @@ -47,14 +52,14 @@ func _draw(): if is_active: var rect = Rect2(Vector2.ZERO, size) draw_rect(rect, color_background) - draw_rect(rect, color_border, false, 1.25 / max(camera.zoom.x, camera.zoom.y)) + draw_rect(rect, color_border, false, 1.1 / max(camera.zoom.x, camera.zoom.y)) -func _on_area_entered(area: Area2D) -> void: - if area.get_parent().owner_id == multiplayer.get_unique_id(): - area.get_parent().is_hovered = true +func _on_area_entered(area: SelectableArea) -> void: + if area.root.owner_id == multiplayer.get_unique_id(): + hover_entered.emit(area.root) -func _on_area_exited(area: Area2D) -> void: - if area.get_parent().owner_id == multiplayer.get_unique_id(): - area.get_parent().is_hovered = false +func _on_area_exited(area: SelectableArea) -> void: + if area.root.owner_id == multiplayer.get_unique_id(): + hover_exited.emit(area.root) diff --git a/Game/Selection/selection_rectangle.gd.uid b/Game/Selection/selection_rectangle.gd.uid new file mode 100644 index 0000000..da2379e --- /dev/null +++ b/Game/Selection/selection_rectangle.gd.uid @@ -0,0 +1 @@ +uid://cku2w6lsd5ylc diff --git a/Game/States/Build/BuildGrid.tscn b/Game/States/Build/BuildGrid.tscn index ffb41d7..b8fc921 100644 --- a/Game/States/Build/BuildGrid.tscn +++ b/Game/States/Build/BuildGrid.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://8oq8aa1q4c1h"] -[ext_resource type="Script" path="res://Game/States/Build/build_grid.gd" id="1_jige0"] +[ext_resource type="Script" uid="uid://c8s5n6o7qbdnp" path="res://Game/States/Build/build_grid.gd" id="1_jige0"] [node name="BuildGrid" type="Node2D"] script = ExtResource("1_jige0") diff --git a/Game/States/Build/BuilderElement.gd b/Game/States/Build/BuilderElement.gd index b564379..e04d4c3 100644 --- a/Game/States/Build/BuilderElement.gd +++ b/Game/States/Build/BuilderElement.gd @@ -79,11 +79,11 @@ func _process(_delta): func can_build(): for area in collision_areas: if area.get_overlapping_areas().size() > 0: - Client.current_stage.add_status_message("Can't build there") + Client.current_stage.notification_manager.add_status_message("Can't build there") return false if area.get_overlapping_bodies().size() > 0: - Client.current_stage.add_status_message("Can't build there") + Client.current_stage.notification_manager.add_status_message("Can't build there") return false #if Client.current_stage.has_method("can_build"): diff --git a/Game/States/Build/BuilderElement.gd.uid b/Game/States/Build/BuilderElement.gd.uid new file mode 100644 index 0000000..d8eaf52 --- /dev/null +++ b/Game/States/Build/BuilderElement.gd.uid @@ -0,0 +1 @@ +uid://dw3887ipukax6 diff --git a/Game/States/Build/BuilderElement.tscn b/Game/States/Build/BuilderElement.tscn index ea0a857..8d42f2e 100644 --- a/Game/States/Build/BuilderElement.tscn +++ b/Game/States/Build/BuilderElement.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cleoiemwasbm5"] -[ext_resource type="Script" path="res://Game/States/Build/BuilderElement.gd" id="1_xxacj"] +[ext_resource type="Script" uid="uid://dw3887ipukax6" path="res://Game/States/Build/BuilderElement.gd" id="1_xxacj"] [node name="BuilderElement" type="Node2D"] script = ExtResource("1_xxacj") diff --git a/Game/States/Build/StateBuild.gd b/Game/States/Build/StateBuild.gd index 0bd5efb..bd44524 100644 --- a/Game/States/Build/StateBuild.gd +++ b/Game/States/Build/StateBuild.gd @@ -4,20 +4,29 @@ extends State static var current_builder_element: BuilderElement +@export var hud: HUD +@export var selection_manager: SelectionManager +@export var tower_manager: TowerManager + + +func _ready() -> void: + Client.placed_tower.connect(_on_placed_tower) + func _state_enter(): %BuildGrid.visible = true + hud.tower_configurations_container.visible = true - if Tower.selected_towers: - for tower in Tower.selected_towers.duplicate(): - tower.is_selected = false + for tower: Tower in selection_manager.get_nodes().duplicate(): + tower.is_selected = false func _state_exit(): %BuildGrid.visible = false + hud.tower_configurations_container.visible = false -func _state_input(event: InputEvent): +func _input(event: InputEvent): if event.is_action_pressed("builder_tower_select"): if current_builder_element: get_viewport().set_input_as_handled() @@ -27,7 +36,7 @@ func _state_input(event: InputEvent): placed_tower.global_position = current_builder_element.global_position - Client.place_tower(placed_tower) + tower_manager.place_tower(placed_tower) if not Input.is_action_pressed("builder_tower_place_keep"): current_builder_element.queue_free() @@ -40,7 +49,7 @@ func _state_input(event: InputEvent): current_builder_element.queue_free() current_builder_element = null - set_state("StateDefault") + state_manager.set_state(state_manager.state_default) if event.is_action_pressed("builder_cancel") and current_builder_element: get_viewport().set_input_as_handled() @@ -49,6 +58,18 @@ func _state_input(event: InputEvent): current_builder_element = null -func _state_unhandled_input(event: InputEvent) -> void: +func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("select"): - set_state("StateDefault") + state_manager.set_state(state_manager.state_default) + + +func _on_placed_tower(tower: Tower) -> void: + tower.selected_secondary.connect(_on_tower_selected_secondary.bind(tower)) + + +func _on_tower_selected_secondary(tower: Tower) -> void: + if state_manager.current_state != self: + return + + if Input.is_action_just_pressed("builder_cancel"): + Client.remove_tower(tower) diff --git a/Game/States/Build/StateBuild.gd.uid b/Game/States/Build/StateBuild.gd.uid new file mode 100644 index 0000000..2175b39 --- /dev/null +++ b/Game/States/Build/StateBuild.gd.uid @@ -0,0 +1 @@ +uid://dvxow1cgbr44o diff --git a/Game/States/Build/StateBuild.tscn b/Game/States/Build/StateBuild.tscn index 84583c2..cbdba9b 100644 --- a/Game/States/Build/StateBuild.tscn +++ b/Game/States/Build/StateBuild.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=3 uid="uid://bo5dp02vlui3l"] -[ext_resource type="Script" path="res://Game/States/Build/StateBuild.gd" id="1_s0n2d"] +[ext_resource type="Script" uid="uid://dvxow1cgbr44o" path="res://Game/States/Build/StateBuild.gd" id="1_s0n2d"] [ext_resource type="PackedScene" uid="uid://8oq8aa1q4c1h" path="res://Game/States/Build/BuildGrid.tscn" id="2_iheti"] -[node name="StateBuild" type="Node"] +[node name="StateBuild" type="Node2D"] script = ExtResource("1_s0n2d") [node name="BuildGrid" parent="." instance=ExtResource("2_iheti")] diff --git a/Game/States/Build/build_grid.gd b/Game/States/Build/build_grid.gd index 67c962e..22bc344 100644 --- a/Game/States/Build/build_grid.gd +++ b/Game/States/Build/build_grid.gd @@ -1,6 +1,8 @@ extends Node2D +@export var stage: Stage + @onready var camera: Camera = get_viewport().get_camera_2d() @@ -11,8 +13,8 @@ func _ready() -> void: func _draw(): - var area = Client.current_stage.map.get_used_rect() - var cell_size = Client.current_stage.map.tile_set.tile_size + var area = stage.map.get_used_rect() + var cell_size = stage.map.tile_set.tile_size var offset = area.position for row in range(0, area.size.y + 1): draw_line( diff --git a/Game/States/Build/build_grid.gd.uid b/Game/States/Build/build_grid.gd.uid new file mode 100644 index 0000000..b417a5c --- /dev/null +++ b/Game/States/Build/build_grid.gd.uid @@ -0,0 +1 @@ +uid://c8s5n6o7qbdnp diff --git a/Game/States/Default/StateDefault.gd b/Game/States/Default/StateDefault.gd index b7b630c..8bc3783 100644 --- a/Game/States/Default/StateDefault.gd +++ b/Game/States/Default/StateDefault.gd @@ -2,20 +2,108 @@ class_name StateDefault extends State -func _state_input(event: InputEvent) -> void: +@export var selection_manager: SelectionManager +@export var selection_rectangle: Area2D + +var hovered_towers: Dictionary[Tower, bool] + + +func _ready() -> void: + Client.placed_tower.connect(_on_placed_tower) + selection_rectangle.hover_entered.connect(_on_selection_rectangle_hover_entered) + selection_rectangle.hover_exited.connect(_on_selection_rectangle_hover_exited) + + +func _state_enter(): + selection_rectangle.is_enabled = true + + +func _state_exit(): + selection_rectangle.is_enabled = false + hovered_towers.clear() + queue_redraw() + Input.set_default_cursor_shape(Input.CURSOR_ARROW) + + +func _input(event: InputEvent) -> void: if event.is_action_pressed("build_mode_start"): - set_state("StateBuild") + state_manager.set_state(state_manager.state_build) if event.is_action_pressed("select"): if Unit.selected_unit: Unit.selected_unit.is_selected = false -func _state_unhandled_input(event: InputEvent) -> void: +func _unhandled_input(event: InputEvent) -> void: # deselect if event.is_action_pressed("select"): # if not multi selecting if not event.is_double_click() and not Input.is_action_pressed("select_multiple"): - if Tower.selected_towers: - for tower in Tower.selected_towers.duplicate(): - tower.is_selected = false + for tower: Tower in selection_manager.get_nodes().duplicate(): + tower.is_selected = false + + +func _draw() -> void: + for tower: Tower in hovered_towers.keys(): + draw_circle( + tower.global_position + Vector2(Client.current_stage.map.tile_set.tile_size) / tower.scale, + 8 + tower.components.get(TowerComponent.ComponentType.Range).range, + Color(1, 1, 1, 0.5), + false, + 1.0 + ) + tower.modulate = Color(1.25, 1.25, 1.25) + + +func _on_placed_tower(tower: Tower) -> void: + tower.hovered.connect(_on_tower_hovered.bind(tower)) + tower.selected_primary.connect(_on_tower_selected.bind(tower)) + tower.double_clicked.connect(_on_tower_double_clicked.bind(tower)) + + +func _on_tower_hovered(is_hovered: bool, tower: Tower) -> void: + if state_manager.current_state != self: + return + + if selection_rectangle.is_active: + return + + if is_hovered: + hovered_towers.set(tower, true) + else: + hovered_towers.erase(tower) + + queue_redraw() + + +func _on_tower_selected(tower: Tower) -> void: + if state_manager.current_state != self: + return + + if Input.is_action_pressed("select_multiple") and tower.is_selected: + tower.is_selected = false + else: + Client.select_tower(tower) + + +func _on_tower_double_clicked(tower: Tower) -> void: + if state_manager.current_state != self: + return + + Client.multi_select(tower.collision_layer) + + +func _on_selection_rectangle_hover_entered(node: Node2D) -> void: + if state_manager.current_state != self: + return + + hovered_towers.set(node, true) + queue_redraw() + + +func _on_selection_rectangle_hover_exited(node: Node2D) -> void: + if state_manager.current_state != self: + return + + hovered_towers.erase(node) + queue_redraw() diff --git a/Game/States/Default/StateDefault.gd.uid b/Game/States/Default/StateDefault.gd.uid new file mode 100644 index 0000000..e5f0784 --- /dev/null +++ b/Game/States/Default/StateDefault.gd.uid @@ -0,0 +1 @@ +uid://7evkkbkbfych diff --git a/Game/States/Default/StateDefault.tscn b/Game/States/Default/StateDefault.tscn index 1f73d30..c51c290 100644 --- a/Game/States/Default/StateDefault.tscn +++ b/Game/States/Default/StateDefault.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cg16o7eqqha70"] -[ext_resource type="Script" path="res://Game/States/Default/StateDefault.gd" id="1_e8s2t"] +[ext_resource type="Script" uid="uid://7evkkbkbfych" path="res://Game/States/Default/StateDefault.gd" id="1_e8s2t"] -[node name="StateDefault" type="Node"] +[node name="StateDefault" type="Node2D"] script = ExtResource("1_e8s2t") diff --git a/Game/States/State.gd b/Game/States/State.gd index c1a2bde..1dafc32 100644 --- a/Game/States/State.gd +++ b/Game/States/State.gd @@ -1,5 +1,8 @@ class_name State -extends Node +extends Node2D + + +@onready var state_manager: StateManager = get_parent() func _state_enter(): @@ -9,5 +12,8 @@ func _state_exit(): pass -func set_state(state: NodePath): - get_parent().set_state(state) +func _state_enable(): + process_mode = Node.PROCESS_MODE_INHERIT + +func _state_disable(): + process_mode = Node.PROCESS_MODE_DISABLED diff --git a/Game/States/State.gd.uid b/Game/States/State.gd.uid new file mode 100644 index 0000000..b417b18 --- /dev/null +++ b/Game/States/State.gd.uid @@ -0,0 +1 @@ +uid://c787ndf8j2dn7 diff --git a/Game/States/StateManager.gd b/Game/States/StateManager.gd index 5a176e2..f1ce0d0 100644 --- a/Game/States/StateManager.gd +++ b/Game/States/StateManager.gd @@ -2,22 +2,27 @@ class_name StateManager extends Node -func _ready(): - Client.state = get_child(0) +signal state_changed(state: State) +var current_state: State -func _input(event: InputEvent) -> void: - Client.state._state_input(event) +@onready var state_default: StateDefault = $StateDefault +@onready var state_build: StateBuild = $StateBuild -func _unhandled_input(event: InputEvent) -> void: - Client.state._state_unhandled_input(event) +func _ready() -> void: + for node in get_children(): + node._state_disable() -func set_state(state: Variant): - if state is not State: - state = get_node(state) +func set_state(state: State): + if current_state: + current_state._state_exit() + current_state._state_disable() - Client.state._state_exit() - Client.state = state - Client.state._state_enter() + current_state = state + + current_state._state_enable() + current_state._state_enter() + + state_changed.emit(current_state) diff --git a/Game/States/StateManager.gd.uid b/Game/States/StateManager.gd.uid new file mode 100644 index 0000000..618d041 --- /dev/null +++ b/Game/States/StateManager.gd.uid @@ -0,0 +1 @@ +uid://gbejl6xlj1ou diff --git a/Game/States/StateManager.tscn b/Game/States/StateManager.tscn index 5584445..136d587 100644 --- a/Game/States/StateManager.tscn +++ b/Game/States/StateManager.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://d4hgrh7danbbx"] -[ext_resource type="Script" path="res://Game/States/StateManager.gd" id="1_1q4x6"] +[ext_resource type="Script" uid="uid://gbejl6xlj1ou" path="res://Game/States/StateManager.gd" id="1_1q4x6"] [node name="StateManager" type="Node"] script = ExtResource("1_1q4x6") |