diff --git a/billiards.tscn b/billiards.tscn index c5d037d..f05db95 100644 --- a/billiards.tscn +++ b/billiards.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=5 format=3 uid="uid://04nv87epssf4"] [ext_resource type="Script" uid="uid://dbca7qndk7coq" path="res://billiards.gd" id="1_bhs8v"] -[ext_resource type="PackedScene" uid="uid://dy51wny4x53f4" path="res://scenes/data_bridge/bridge.tscn" id="1_xa5nf"] -[ext_resource type="PackedScene" uid="uid://cbvv2msu13vr2" path="res://game_client.tscn" id="3_hkpkv"] -[ext_resource type="PackedScene" uid="uid://bss61m8hfvab3" path="res://game_server.tscn" id="4_cni66"] +[ext_resource type="PackedScene" uid="uid://dy51wny4x53f4" path="res://scenes/data/data_bridge.tscn" id="1_xa5nf"] +[ext_resource type="PackedScene" uid="uid://cbvv2msu13vr2" path="res://controllers/networking/game_client.tscn" id="3_hkpkv"] +[ext_resource type="PackedScene" uid="uid://bss61m8hfvab3" path="res://controllers/networking/game_server.tscn" id="4_cni66"] [node name="billiards" type="Node"] script = ExtResource("1_bhs8v") -[node name="bridge" parent="." instance=ExtResource("1_xa5nf")] +[node name="data_bridge" parent="." instance=ExtResource("1_xa5nf")] [node name="game_client" parent="." instance=ExtResource("3_hkpkv")] diff --git a/game_client.gd b/controllers/networking/game_client.gd similarity index 100% rename from game_client.gd rename to controllers/networking/game_client.gd diff --git a/game_client.gd.uid b/controllers/networking/game_client.gd.uid similarity index 100% rename from game_client.gd.uid rename to controllers/networking/game_client.gd.uid diff --git a/game_client.tscn b/controllers/networking/game_client.tscn similarity index 77% rename from game_client.tscn rename to controllers/networking/game_client.tscn index 788bc4d..1cd6228 100644 --- a/game_client.tscn +++ b/controllers/networking/game_client.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cbvv2msu13vr2"] -[ext_resource type="Script" uid="uid://cjtu1d1j35r32" path="res://game_client.gd" id="1_tea1p"] +[ext_resource type="Script" uid="uid://cjtu1d1j35r32" path="res://controllers/networking/game_client.gd" id="1_tea1p"] [node name="client_net" type="Node"] script = ExtResource("1_tea1p") diff --git a/game_server.gd b/controllers/networking/game_server.gd similarity index 100% rename from game_server.gd rename to controllers/networking/game_server.gd diff --git a/game_server.gd.uid b/controllers/networking/game_server.gd.uid similarity index 100% rename from game_server.gd.uid rename to controllers/networking/game_server.gd.uid diff --git a/game_server.tscn b/controllers/networking/game_server.tscn similarity index 77% rename from game_server.tscn rename to controllers/networking/game_server.tscn index b610315..548c85b 100644 --- a/game_server.tscn +++ b/controllers/networking/game_server.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bss61m8hfvab3"] -[ext_resource type="Script" uid="uid://bndylf4rwtlkn" path="res://game_server.gd" id="1_3xapr"] +[ext_resource type="Script" uid="uid://bndylf4rwtlkn" path="res://controllers/networking/game_server.gd" id="1_3xapr"] [node name="server_net" type="Node"] script = ExtResource("1_3xapr") diff --git a/scenes/data_bridge/bridge.tscn b/scenes/data/data_bridge.tscn similarity index 67% rename from scenes/data_bridge/bridge.tscn rename to scenes/data/data_bridge.tscn index 1c15ce6..4f0c8fd 100644 --- a/scenes/data_bridge/bridge.tscn +++ b/scenes/data/data_bridge.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=5 format=3 uid="uid://dy51wny4x53f4"] -[ext_resource type="Script" uid="uid://52eithlmedm3" path="res://scenes/data_bridge/game_data.gd" id="1_hulqm"] -[ext_resource type="Script" uid="uid://dvw46rvml3ec" path="res://scenes/data_bridge/game_state.gd" id="2_6ash1"] -[ext_resource type="Script" uid="uid://6sfwe1hwgf0g" path="res://scenes/data_bridge/lobby_data.gd" id="3_80q4n"] -[ext_resource type="Script" uid="uid://bs4vblwa3u5jq" path="res://scenes/data_bridge/multiplayer_data.gd" id="4_setx2"] +[ext_resource type="Script" uid="uid://52eithlmedm3" path="res://scenes/data/game_data.gd" id="1_hulqm"] +[ext_resource type="Script" uid="uid://dvw46rvml3ec" path="res://scenes/data/game_state.gd" id="2_6ash1"] +[ext_resource type="Script" uid="uid://6sfwe1hwgf0g" path="res://scenes/data/lobby_data.gd" id="3_80q4n"] +[ext_resource type="Script" uid="uid://bs4vblwa3u5jq" path="res://scenes/data/multiplayer_data.gd" id="4_setx2"] -[node name="bridge" type="Node"] +[node name="data_bridge" type="Node"] [node name="game_data" type="Node" parent="."] script = ExtResource("1_hulqm") @@ -16,5 +16,5 @@ script = ExtResource("2_6ash1") [node name="lobby_data" type="Node" parent="."] script = ExtResource("3_80q4n") -[node name="multiplayer" type="Node" parent="."] +[node name="multiplayer_data" type="Node" parent="."] script = ExtResource("4_setx2") diff --git a/scenes/data_bridge/game_data.gd b/scenes/data/game_data.gd similarity index 100% rename from scenes/data_bridge/game_data.gd rename to scenes/data/game_data.gd diff --git a/scenes/data_bridge/game_data.gd.uid b/scenes/data/game_data.gd.uid similarity index 100% rename from scenes/data_bridge/game_data.gd.uid rename to scenes/data/game_data.gd.uid diff --git a/scenes/data_bridge/game_state.gd b/scenes/data/game_state.gd similarity index 100% rename from scenes/data_bridge/game_state.gd rename to scenes/data/game_state.gd diff --git a/scenes/data_bridge/game_state.gd.uid b/scenes/data/game_state.gd.uid similarity index 100% rename from scenes/data_bridge/game_state.gd.uid rename to scenes/data/game_state.gd.uid diff --git a/scenes/data_bridge/lobby_data.gd b/scenes/data/lobby_data.gd similarity index 100% rename from scenes/data_bridge/lobby_data.gd rename to scenes/data/lobby_data.gd diff --git a/scenes/data_bridge/lobby_data.gd.uid b/scenes/data/lobby_data.gd.uid similarity index 100% rename from scenes/data_bridge/lobby_data.gd.uid rename to scenes/data/lobby_data.gd.uid diff --git a/scenes/data_bridge/multiplayer_data.gd b/scenes/data/multiplayer_data.gd similarity index 100% rename from scenes/data_bridge/multiplayer_data.gd rename to scenes/data/multiplayer_data.gd diff --git a/scenes/data_bridge/multiplayer_data.gd.uid b/scenes/data/multiplayer_data.gd.uid similarity index 100% rename from scenes/data_bridge/multiplayer_data.gd.uid rename to scenes/data/multiplayer_data.gd.uid diff --git a/scenes/screens/lobby_screen/lobby.tscn b/scenes/screens/lobby_screen/lobby.tscn index 86d85da..bc334e3 100644 --- a/scenes/screens/lobby_screen/lobby.tscn +++ b/scenes/screens/lobby_screen/lobby.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://dkes5cdu45q6e"] +[gd_scene load_steps=4 format=3 uid="uid://dkes5cdu45q6e"] [ext_resource type="Script" uid="uid://dk7afnf7ol7dy" path="res://scenes/screens/lobby_screen/lobby.gd" id="1_hhiik"] -[ext_resource type="PackedScene" uid="uid://dg7pgj6i5pk8p" path="res://scenes/ui_controls/lobby_screen/lobby_ui.tscn" id="2_lqt48"] -[ext_resource type="Script" uid="uid://sihv0kwbcr33" path="res://scenes/screens/lobby_screen/lobby_rpc.gd" id="3_rurl6"] +[ext_resource type="PackedScene" uid="uid://dg7pgj6i5pk8p" path="res://scenes/ui_controls/lobby/ui.tscn" id="2_lqt48"] [ext_resource type="Script" uid="uid://dv7j35h2ngiq7" path="res://scenes/screens/lobby_screen/lobby_client.gd" id="4_glu7g"] [node name="lobby" type="Node"] @@ -27,9 +26,6 @@ visible = false context_menu_enabled = false select_all_on_focus = true -[node name="rpc_signals" type="Node" parent="."] -script = ExtResource("3_rurl6") - [node name="client" type="Node" parent="."] script = ExtResource("4_glu7g") diff --git a/scenes/screens/lobby_screen/lobby_base.gd b/scenes/screens/lobby_screen/lobby_base.gd index 85a0f35..dc337ed 100644 --- a/scenes/screens/lobby_screen/lobby_base.gd +++ b/scenes/screens/lobby_screen/lobby_base.gd @@ -16,7 +16,6 @@ const MATCH_ENTRY = preload("res://scenes/screens/lobb @onready var match_create_vbox: VBoxContainer = $ui/body/right_body @onready var new_match_name_input: LineEdit = $ui/body/right_body/create_match_hbox/new_match_name_input -@onready var rpc_signals: Node = $rpc_signals @onready var client: LobbyClient = $client var active_mode: String = "freeball" diff --git a/scenes/screens/lobby_screen/lobby_rpc.gd b/scenes/screens/lobby_screen/lobby_rpc.gd deleted file mode 100644 index 61510e1..0000000 --- a/scenes/screens/lobby_screen/lobby_rpc.gd +++ /dev/null @@ -1 +0,0 @@ -extends Node diff --git a/scenes/screens/lobby_screen/lobby_rpc.gd.uid b/scenes/screens/lobby_screen/lobby_rpc.gd.uid deleted file mode 100644 index 3cc1afb..0000000 --- a/scenes/screens/lobby_screen/lobby_rpc.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://sihv0kwbcr33 diff --git a/scenes/ui_controls/lobby_screen/lobby_ui.tscn b/scenes/ui_controls/lobby/ui.tscn similarity index 100% rename from scenes/ui_controls/lobby_screen/lobby_ui.tscn rename to scenes/ui_controls/lobby/ui.tscn