diff --git a/billiards.tscn b/billiards.tscn index f05db95..9d375c9 100644 --- a/billiards.tscn +++ b/billiards.tscn @@ -1,9 +1,9 @@ [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/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"] +[ext_resource type="PackedScene" uid="uid://dy51wny4x53f4" path="res://scripts/data/data_bridge.tscn" id="1_xa5nf"] +[ext_resource type="PackedScene" uid="uid://cbvv2msu13vr2" path="res://scripts/controllers/networking/game_client.tscn" id="3_hkpkv"] +[ext_resource type="PackedScene" uid="uid://bss61m8hfvab3" path="res://scripts/controllers/networking/game_server.tscn" id="4_cni66"] [node name="billiards" type="Node"] script = ExtResource("1_bhs8v") diff --git a/export_presets.cfg b/export_presets.cfg index 887f4ca..1ab9590 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -86,3 +86,71 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" + +[preset.2] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../builds/desktop/billiards/billiards-win.exe" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.2.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +shader_baker/enabled=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="" +application/product_name="" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'" diff --git a/scenes/game.tscn b/scenes/game.tscn index 6101d55..e6818f4 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -3,8 +3,8 @@ [ext_resource type="Script" uid="uid://kpfpfmvbg24c" path="res://scenes/game.gd" id="1_iywne"] [ext_resource type="PackedScene" uid="uid://djtq6hbp70kut" path="res://scenes/environments/base_environment.tscn" id="2_lbhrr"] [ext_resource type="PackedScene" uid="uid://b5idltq8s4srp" path="res://scenes/individual_parts/table/pool_table_manager.tscn" id="3_lnu2h"] -[ext_resource type="PackedScene" uid="uid://bw7f8kunlxd2" path="res://controllers/game/modes/game_manager.tscn" id="4_iywne"] -[ext_resource type="PackedScene" uid="uid://himb0o6py5pt" path="res://scenes/ui_controls/base_ui.tscn" id="7_u5sy4"] +[ext_resource type="PackedScene" uid="uid://bw7f8kunlxd2" path="res://scripts/controllers/game/modes/game_manager.tscn" id="4_iywne"] +[ext_resource type="PackedScene" uid="uid://himb0o6py5pt" path="res://scenes/ui/game/game_ui.tscn" id="7_u5sy4"] [node name="game" type="Node3D"] script = ExtResource("1_iywne") @@ -17,4 +17,4 @@ metadata/_edit_lock_ = true [node name="game_manager" parent="." instance=ExtResource("4_iywne")] -[node name="base_ui" parent="." instance=ExtResource("7_u5sy4")] +[node name="game_ui" parent="." instance=ExtResource("7_u5sy4")] diff --git a/scenes/screens/lobby_screen/lobby.tscn b/scenes/screens/lobby_screen/lobby.tscn index bc334e3..c05a6c4 100644 --- a/scenes/screens/lobby_screen/lobby.tscn +++ b/scenes/screens/lobby_screen/lobby.tscn @@ -1,42 +1,42 @@ [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/ui.tscn" id="2_lqt48"] +[ext_resource type="PackedScene" uid="uid://dg7pgj6i5pk8p" path="res://scenes/ui/lobby/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"] script = ExtResource("1_hhiik") -[node name="ui" parent="." instance=ExtResource("2_lqt48")] +[node name="lobby_ui" parent="." instance=ExtResource("2_lqt48")] -[node name="host_address_input" parent="ui/body/left_body/server_host_hbox" index="1"] +[node name="host_address_input" parent="lobby_ui/body/left_body/server_host_hbox" index="1"] context_menu_enabled = false select_all_on_focus = true -[node name="host_port_range" parent="ui/body/left_body/server_host_hbox" index="2"] +[node name="host_port_range" parent="lobby_ui/body/left_body/server_host_hbox" index="2"] select_all_on_focus = true -[node name="match_search_input" parent="ui/body/left_body/search_vbox/search_hbox" index="0"] +[node name="match_search_input" parent="lobby_ui/body/left_body/search_vbox/search_hbox" index="0"] context_menu_enabled = false -[node name="right_body" parent="ui/body" index="1"] +[node name="right_body" parent="lobby_ui/body" index="1"] visible = false -[node name="new_match_name_input" parent="ui/body/right_body/create_match_hbox" index="0"] +[node name="new_match_name_input" parent="lobby_ui/body/right_body/create_match_hbox" index="0"] context_menu_enabled = false select_all_on_focus = true [node name="client" type="Node" parent="."] script = ExtResource("4_glu7g") -[connection signal="pressed" from="ui/body/left_body/server_host_hbox/home_bttn" to="." method="_on_home_bttn_pressed"] -[connection signal="pressed" from="ui/body/left_body/server_host_hbox/host_connect_bttn" to="." method="_on_host_connect_bttn_pressed"] -[connection signal="pressed" from="ui/body/left_body/server_host_hbox/host_disconnect_bttn" to="." method="_on_host_disconnect_bttn_pressed"] -[connection signal="pressed" from="ui/body/left_body/search_vbox/search_hbox/match_search_bttn" to="." method="_on_match_search_bttn_pressed"] -[connection signal="pressed" from="ui/body/right_body/create_match_hbox/match_create_bttn" to="." method="_on_match_create_bttn_pressed"] -[connection signal="pressed" from="ui/body/right_body/vbox/8ball" to="." method="_on_mode_bttn_pressed" flags=18] -[connection signal="pressed" from="ui/body/right_body/vbox/9ball" to="." method="_on_mode_bttn_pressed" flags=18] -[connection signal="pressed" from="ui/body/right_body/vbox/snooker" to="." method="_on_mode_bttn_pressed" flags=18] -[connection signal="pressed" from="ui/body/right_body/vbox/freeball" to="." method="_on_mode_bttn_pressed" flags=18] +[connection signal="pressed" from="lobby_ui/body/left_body/server_host_hbox/home_bttn" to="." method="_on_home_bttn_pressed"] +[connection signal="pressed" from="lobby_ui/body/left_body/server_host_hbox/host_connect_bttn" to="." method="_on_host_connect_bttn_pressed"] +[connection signal="pressed" from="lobby_ui/body/left_body/server_host_hbox/host_disconnect_bttn" to="." method="_on_host_disconnect_bttn_pressed"] +[connection signal="pressed" from="lobby_ui/body/left_body/search_vbox/search_hbox/match_search_bttn" to="." method="_on_match_search_bttn_pressed"] +[connection signal="pressed" from="lobby_ui/body/right_body/create_match_hbox/match_create_bttn" to="." method="_on_match_create_bttn_pressed"] +[connection signal="pressed" from="lobby_ui/body/right_body/vbox/8ball" to="." method="_on_mode_bttn_pressed" flags=18] +[connection signal="pressed" from="lobby_ui/body/right_body/vbox/9ball" to="." method="_on_mode_bttn_pressed" flags=18] +[connection signal="pressed" from="lobby_ui/body/right_body/vbox/snooker" to="." method="_on_mode_bttn_pressed" flags=18] +[connection signal="pressed" from="lobby_ui/body/right_body/vbox/freeball" to="." method="_on_mode_bttn_pressed" flags=18] -[editable path="ui"] +[editable path="lobby_ui"] diff --git a/scenes/screens/lobby_screen/lobby_base.gd b/scenes/screens/lobby_screen/lobby_base.gd index dc337ed..5545979 100644 --- a/scenes/screens/lobby_screen/lobby_base.gd +++ b/scenes/screens/lobby_screen/lobby_base.gd @@ -3,18 +3,18 @@ class_name LobbyBase extends Node const MATCH_ENTRY = preload("res://scenes/screens/lobby_screen/match_entry.tscn") -@onready var host_address_input: LineEdit = $ui/body/left_body/server_host_hbox/host_address_input -@onready var host_port_range: SpinBox = $ui/body/left_body/server_host_hbox/host_port_range -@onready var host_connect_bttn: Button = $ui/body/left_body/server_host_hbox/host_connect_bttn -@onready var host_disconnect_bttn: Button = $ui/body/left_body/server_host_hbox/host_disconnect_bttn +@onready var host_address_input: LineEdit = $lobby_ui/body/left_body/server_host_hbox/host_address_input +@onready var host_port_range: SpinBox = $lobby_ui/body/left_body/server_host_hbox/host_port_range +@onready var host_connect_bttn: Button = $lobby_ui/body/left_body/server_host_hbox/host_connect_bttn +@onready var host_disconnect_bttn: Button = $lobby_ui/body/left_body/server_host_hbox/host_disconnect_bttn -@onready var search_vbox: VBoxContainer = $ui/body/left_body/search_vbox -@onready var match_search_input: LineEdit = $ui/body/left_body/search_vbox/search_hbox/match_search_input -@onready var match_search_bttn: Button = $ui/body/left_body/search_vbox/search_hbox/match_search_bttn -@onready var match_list: VBoxContainer = $ui/body/left_body/search_vbox/scroll_container/match_list +@onready var search_vbox: VBoxContainer = $lobby_ui/body/left_body/search_vbox +@onready var match_search_input: LineEdit = $lobby_ui/body/left_body/search_vbox/search_hbox/match_search_input +@onready var match_search_bttn: Button = $lobby_ui/body/left_body/search_vbox/search_hbox/match_search_bttn +@onready var match_list: VBoxContainer = $lobby_ui/body/left_body/search_vbox/scroll_container/match_list -@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 match_create_vbox: VBoxContainer = $lobby_ui/body/right_body +@onready var new_match_name_input: LineEdit = $lobby_ui/body/right_body/create_match_hbox/new_match_name_input @onready var client: LobbyClient = $client diff --git a/scenes/screens/start_screen/start.tscn b/scenes/screens/start_screen/start.tscn index 23243ab..0f6b89b 100644 --- a/scenes/screens/start_screen/start.tscn +++ b/scenes/screens/start_screen/start.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://cywa27h25s1j8" path="res://scenes/screens/start_screen/start.gd" id="1_mqdda"] [ext_resource type="PackedScene" uid="uid://djtq6hbp70kut" path="res://scenes/environments/base_environment.tscn" id="2_7nvb2"] [ext_resource type="PackedScene" uid="uid://2ib7f3y41pq4" path="res://assets/converted/full_pool_scene_original/scene.gltf" id="3_rfj27"] -[ext_resource type="PackedScene" uid="uid://da0ok71rkjpx8" path="res://scenes/menus/start_menu/start_menu_controls.tscn" id="4_hk434"] +[ext_resource type="PackedScene" uid="uid://da0ok71rkjpx8" path="res://scenes/ui/start_screen/start_ui.tscn" id="4_hk434"] [sub_resource type="Animation" id="Animation_qell1"] length = 0.001 diff --git a/scenes/ui_controls/camera/camera_controller.gd b/scenes/ui/game/camera/camera_controller.gd similarity index 100% rename from scenes/ui_controls/camera/camera_controller.gd rename to scenes/ui/game/camera/camera_controller.gd diff --git a/scenes/ui_controls/camera/camera_controller.gd.uid b/scenes/ui/game/camera/camera_controller.gd.uid similarity index 100% rename from scenes/ui_controls/camera/camera_controller.gd.uid rename to scenes/ui/game/camera/camera_controller.gd.uid diff --git a/scenes/ui_controls/camera/camera_controller.tscn b/scenes/ui/game/camera/camera_controller.tscn similarity index 96% rename from scenes/ui_controls/camera/camera_controller.tscn rename to scenes/ui/game/camera/camera_controller.tscn index 22db4a5..7faa8cb 100644 --- a/scenes/ui_controls/camera/camera_controller.tscn +++ b/scenes/ui/game/camera/camera_controller.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://w3vh1gj6t2k2"] -[ext_resource type="Script" uid="uid://bpf107mmjiswh" path="res://scenes/ui_controls/camera/camera_controller.gd" id="1_mvpa7"] +[ext_resource type="Script" uid="uid://bpf107mmjiswh" path="res://scenes/ui/game/camera/camera_controller.gd" id="1_mvpa7"] [sub_resource type="LabelSettings" id="LabelSettings_mvpa7"] font_size = 24 diff --git a/scenes/ui_controls/game/data.gd b/scenes/ui/game/data/data_ui.gd similarity index 100% rename from scenes/ui_controls/game/data.gd rename to scenes/ui/game/data/data_ui.gd diff --git a/scenes/ui_controls/game/data.gd.uid b/scenes/ui/game/data/data_ui.gd.uid similarity index 100% rename from scenes/ui_controls/game/data.gd.uid rename to scenes/ui/game/data/data_ui.gd.uid diff --git a/scenes/ui_controls/game/data.tscn b/scenes/ui/game/data/data_ui.tscn similarity index 91% rename from scenes/ui_controls/game/data.tscn rename to scenes/ui/game/data/data_ui.tscn index b04a309..63cfca0 100644 --- a/scenes/ui_controls/game/data.tscn +++ b/scenes/ui/game/data/data_ui.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=3 format=3 uid="uid://l3bve6miq8od"] -[ext_resource type="Script" uid="uid://br6jmlm4poh62" path="res://scenes/ui_controls/game/data.gd" id="1_s7215"] +[ext_resource type="Script" uid="uid://br6jmlm4poh62" path="res://scenes/ui/game/data/data_ui.gd" id="1_nropj"] [sub_resource type="LabelSettings" id="LabelSettings_o1hjn"] font_color = Color(0, 1, 0.14117648, 1) -[node name="data" type="Control"] +[node name="data_ui" type="Control"] layout_mode = 3 anchors_preset = 10 anchor_right = 1.0 grow_horizontal = 2 -script = ExtResource("1_s7215") +script = ExtResource("1_nropj") [node name="vbox" type="VBoxContainer" parent="."] layout_mode = 0 diff --git a/scenes/ui_controls/base_ui.gd b/scenes/ui/game/game_ui.gd similarity index 100% rename from scenes/ui_controls/base_ui.gd rename to scenes/ui/game/game_ui.gd diff --git a/scenes/ui_controls/base_ui.gd.uid b/scenes/ui/game/game_ui.gd.uid similarity index 100% rename from scenes/ui_controls/base_ui.gd.uid rename to scenes/ui/game/game_ui.gd.uid diff --git a/scenes/ui_controls/base_ui.tscn b/scenes/ui/game/game_ui.tscn similarity index 86% rename from scenes/ui_controls/base_ui.tscn rename to scenes/ui/game/game_ui.tscn index e47f370..03cdb7c 100644 --- a/scenes/ui_controls/base_ui.tscn +++ b/scenes/ui/game/game_ui.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://himb0o6py5pt"] -[ext_resource type="Script" uid="uid://b3torx8lbkrj7" path="res://scenes/ui_controls/base_ui.gd" id="1_4moq4"] -[ext_resource type="PackedScene" uid="uid://l3bve6miq8od" path="res://scenes/ui_controls/game/data.tscn" id="1_ff2ky"] -[ext_resource type="PackedScene" uid="uid://w3vh1gj6t2k2" path="res://scenes/ui_controls/camera/camera_controller.tscn" id="2_4moq4"] +[ext_resource type="Script" uid="uid://b3torx8lbkrj7" path="res://scenes/ui/game/game_ui.gd" id="1_4moq4"] +[ext_resource type="PackedScene" uid="uid://l3bve6miq8od" path="res://scenes/ui/game/data/data_ui.tscn" id="1_ff2ky"] +[ext_resource type="PackedScene" uid="uid://w3vh1gj6t2k2" path="res://scenes/ui/game/camera/camera_controller.tscn" id="2_4moq4"] -[node name="base_ui" type="Control"] +[node name="game_ui" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -48,7 +48,7 @@ shortcut_keys_enabled = false horizontal_alignment = 1 vertical_alignment = 1 -[node name="game_data" parent="." instance=ExtResource("1_ff2ky")] +[node name="data_ui" parent="." instance=ExtResource("1_ff2ky")] z_index = 5 layout_mode = 1 diff --git a/scenes/ui_controls/lobby/ui.tscn b/scenes/ui/lobby/lobby_ui.tscn similarity index 99% rename from scenes/ui_controls/lobby/ui.tscn rename to scenes/ui/lobby/lobby_ui.tscn index 927f843..e6544b1 100644 --- a/scenes/ui_controls/lobby/ui.tscn +++ b/scenes/ui/lobby/lobby_ui.tscn @@ -22,7 +22,7 @@ corner_radius_top_right = 3 corner_radius_bottom_right = 3 corner_radius_bottom_left = 3 -[node name="margin" type="MarginContainer"] +[node name="lobby_ui" type="MarginContainer"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/scenes/menus/start_menu/start_menu_controls.gd b/scenes/ui/start_screen/start_ui.gd similarity index 100% rename from scenes/menus/start_menu/start_menu_controls.gd rename to scenes/ui/start_screen/start_ui.gd diff --git a/scenes/menus/start_menu/start_menu_controls.gd.uid b/scenes/ui/start_screen/start_ui.gd.uid similarity index 100% rename from scenes/menus/start_menu/start_menu_controls.gd.uid rename to scenes/ui/start_screen/start_ui.gd.uid diff --git a/scenes/menus/start_menu/start_menu_controls.tscn b/scenes/ui/start_screen/start_ui.tscn similarity index 83% rename from scenes/menus/start_menu/start_menu_controls.tscn rename to scenes/ui/start_screen/start_ui.tscn index 807a628..effa38e 100644 --- a/scenes/menus/start_menu/start_menu_controls.tscn +++ b/scenes/ui/start_screen/start_ui.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=3 format=3 uid="uid://da0ok71rkjpx8"] -[ext_resource type="AudioStream" uid="uid://dcaul3y5u0mko" path="res://sounds/effects/ball-hits.wav" id="1_b58tg"] -[ext_resource type="Script" uid="uid://ykbcl0j1wouh" path="res://scenes/menus/start_menu/start_menu_controls.gd" id="1_fnwei"] +[ext_resource type="Script" uid="uid://ykbcl0j1wouh" path="res://scenes/ui/start_screen/start_ui.gd" id="1_mwcbl"] +[ext_resource type="AudioStream" uid="uid://dcaul3y5u0mko" path="res://sounds/effects/ball-hits.wav" id="2_uxmhm"] -[node name="start_menu_controls" type="Control"] +[node name="start_ui" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_fnwei") +script = ExtResource("1_mwcbl") [node name="vbox" type="VBoxContainer" parent="."] layout_mode = 1 @@ -32,7 +32,7 @@ mouse_default_cursor_shape = 2 text = "Multiplayer" [node name="button_sound" type="AudioStreamPlayer" parent="."] -stream = ExtResource("1_b58tg") +stream = ExtResource("2_uxmhm") [connection signal="mouse_entered" from="vbox/play_bttn" to="." method="_bttn_mouse_entered"] [connection signal="pressed" from="vbox/play_bttn" to="." method="_on_play_bttn_pressed"] diff --git a/controllers/game/modes/8_ball.gd b/scripts/controllers/game/modes/8_ball.gd similarity index 100% rename from controllers/game/modes/8_ball.gd rename to scripts/controllers/game/modes/8_ball.gd diff --git a/controllers/game/modes/8_ball.gd.uid b/scripts/controllers/game/modes/8_ball.gd.uid similarity index 100% rename from controllers/game/modes/8_ball.gd.uid rename to scripts/controllers/game/modes/8_ball.gd.uid diff --git a/controllers/game/modes/8_ball.tscn b/scripts/controllers/game/modes/8_ball.tscn similarity index 76% rename from controllers/game/modes/8_ball.tscn rename to scripts/controllers/game/modes/8_ball.tscn index 4a01e40..84916aa 100644 --- a/controllers/game/modes/8_ball.tscn +++ b/scripts/controllers/game/modes/8_ball.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://b6hjxh7luqvj8"] -[ext_resource type="Script" uid="uid://bruauynfkrqvv" path="res://controllers/game/modes/8_ball.gd" id="1_6i6et"] +[ext_resource type="Script" uid="uid://bruauynfkrqvv" path="res://scripts/controllers/game/modes/8_ball.gd" id="1_6i6et"] [node name="8-ball" type="Node"] script = ExtResource("1_6i6et") diff --git a/controllers/game/modes/9_ball.gd b/scripts/controllers/game/modes/9_ball.gd similarity index 100% rename from controllers/game/modes/9_ball.gd rename to scripts/controllers/game/modes/9_ball.gd diff --git a/controllers/game/modes/9_ball.gd.uid b/scripts/controllers/game/modes/9_ball.gd.uid similarity index 100% rename from controllers/game/modes/9_ball.gd.uid rename to scripts/controllers/game/modes/9_ball.gd.uid diff --git a/controllers/game/modes/9_ball.tscn b/scripts/controllers/game/modes/9_ball.tscn similarity index 76% rename from controllers/game/modes/9_ball.tscn rename to scripts/controllers/game/modes/9_ball.tscn index 6e3e4fd..5c8d125 100644 --- a/controllers/game/modes/9_ball.tscn +++ b/scripts/controllers/game/modes/9_ball.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cej6o2ix55hu6"] -[ext_resource type="Script" uid="uid://da6061q2oytcw" path="res://controllers/game/modes/9_ball.gd" id="1_4m6hi"] +[ext_resource type="Script" uid="uid://da6061q2oytcw" path="res://scripts/controllers/game/modes/9_ball.gd" id="1_4m6hi"] [node name="9-ball" type="Node"] script = ExtResource("1_4m6hi") diff --git a/controllers/game/modes/base_mode.gd b/scripts/controllers/game/modes/base_mode.gd similarity index 100% rename from controllers/game/modes/base_mode.gd rename to scripts/controllers/game/modes/base_mode.gd diff --git a/controllers/game/modes/base_mode.gd.uid b/scripts/controllers/game/modes/base_mode.gd.uid similarity index 100% rename from controllers/game/modes/base_mode.gd.uid rename to scripts/controllers/game/modes/base_mode.gd.uid diff --git a/controllers/game/modes/free_ball.gd b/scripts/controllers/game/modes/free_ball.gd similarity index 100% rename from controllers/game/modes/free_ball.gd rename to scripts/controllers/game/modes/free_ball.gd diff --git a/controllers/game/modes/free_ball.gd.uid b/scripts/controllers/game/modes/free_ball.gd.uid similarity index 100% rename from controllers/game/modes/free_ball.gd.uid rename to scripts/controllers/game/modes/free_ball.gd.uid diff --git a/controllers/game/modes/free_ball.tscn b/scripts/controllers/game/modes/free_ball.tscn similarity index 76% rename from controllers/game/modes/free_ball.tscn rename to scripts/controllers/game/modes/free_ball.tscn index 15e2e68..82dd9cd 100644 --- a/controllers/game/modes/free_ball.tscn +++ b/scripts/controllers/game/modes/free_ball.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c5jdawgemyqu8"] -[ext_resource type="Script" uid="uid://cnjaupry2q5aj" path="res://controllers/game/modes/snooker.gd" id="1_3fw5q"] +[ext_resource type="Script" uid="uid://cnjaupry2q5aj" path="res://scripts/controllers/game/modes/snooker.gd" id="1_3fw5q"] [node name="free_ball" type="Node"] script = ExtResource("1_3fw5q") diff --git a/controllers/game/modes/game_manager.gd b/scripts/controllers/game/modes/game_manager.gd similarity index 100% rename from controllers/game/modes/game_manager.gd rename to scripts/controllers/game/modes/game_manager.gd diff --git a/controllers/game/modes/game_manager.gd.uid b/scripts/controllers/game/modes/game_manager.gd.uid similarity index 100% rename from controllers/game/modes/game_manager.gd.uid rename to scripts/controllers/game/modes/game_manager.gd.uid diff --git a/controllers/game/modes/game_manager.tscn b/scripts/controllers/game/modes/game_manager.tscn similarity index 75% rename from controllers/game/modes/game_manager.tscn rename to scripts/controllers/game/modes/game_manager.tscn index 6c87423..5d9509e 100644 --- a/controllers/game/modes/game_manager.tscn +++ b/scripts/controllers/game/modes/game_manager.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bw7f8kunlxd2"] -[ext_resource type="Script" uid="uid://csrolkxqgy5cj" path="res://controllers/game/modes/game_manager.gd" id="1_pwtrd"] +[ext_resource type="Script" uid="uid://csrolkxqgy5cj" path="res://scripts/controllers/game/modes/game_manager.gd" id="1_pwtrd"] [node name="game_manager" type="Node"] script = ExtResource("1_pwtrd") diff --git a/controllers/game/modes/game_manager_base.gd b/scripts/controllers/game/modes/game_manager_base.gd similarity index 100% rename from controllers/game/modes/game_manager_base.gd rename to scripts/controllers/game/modes/game_manager_base.gd diff --git a/controllers/game/modes/game_manager_base.gd.uid b/scripts/controllers/game/modes/game_manager_base.gd.uid similarity index 100% rename from controllers/game/modes/game_manager_base.gd.uid rename to scripts/controllers/game/modes/game_manager_base.gd.uid diff --git a/controllers/game/modes/game_manager_multiplayer.gd b/scripts/controllers/game/modes/game_manager_multiplayer.gd similarity index 100% rename from controllers/game/modes/game_manager_multiplayer.gd rename to scripts/controllers/game/modes/game_manager_multiplayer.gd diff --git a/controllers/game/modes/game_manager_multiplayer.gd.uid b/scripts/controllers/game/modes/game_manager_multiplayer.gd.uid similarity index 100% rename from controllers/game/modes/game_manager_multiplayer.gd.uid rename to scripts/controllers/game/modes/game_manager_multiplayer.gd.uid diff --git a/controllers/game/modes/last_ball_mode.gd b/scripts/controllers/game/modes/last_ball_mode.gd similarity index 100% rename from controllers/game/modes/last_ball_mode.gd rename to scripts/controllers/game/modes/last_ball_mode.gd diff --git a/controllers/game/modes/last_ball_mode.gd.uid b/scripts/controllers/game/modes/last_ball_mode.gd.uid similarity index 100% rename from controllers/game/modes/last_ball_mode.gd.uid rename to scripts/controllers/game/modes/last_ball_mode.gd.uid diff --git a/controllers/game/modes/snooker.gd b/scripts/controllers/game/modes/snooker.gd similarity index 100% rename from controllers/game/modes/snooker.gd rename to scripts/controllers/game/modes/snooker.gd diff --git a/controllers/game/modes/snooker.gd.uid b/scripts/controllers/game/modes/snooker.gd.uid similarity index 100% rename from controllers/game/modes/snooker.gd.uid rename to scripts/controllers/game/modes/snooker.gd.uid diff --git a/controllers/game/modes/snooker.tscn b/scripts/controllers/game/modes/snooker.tscn similarity index 76% rename from controllers/game/modes/snooker.tscn rename to scripts/controllers/game/modes/snooker.tscn index 0920463..5992fda 100644 --- a/controllers/game/modes/snooker.tscn +++ b/scripts/controllers/game/modes/snooker.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bh05rdwspf87c"] -[ext_resource type="Script" uid="uid://cnjaupry2q5aj" path="res://controllers/game/modes/snooker.gd" id="1_yq5ii"] +[ext_resource type="Script" uid="uid://cnjaupry2q5aj" path="res://scripts/controllers/game/modes/snooker.gd" id="1_yq5ii"] [node name="snooker" type="Node"] script = ExtResource("1_yq5ii") diff --git a/controllers/networking/game_client.gd b/scripts/controllers/networking/game_client.gd similarity index 100% rename from controllers/networking/game_client.gd rename to scripts/controllers/networking/game_client.gd diff --git a/controllers/networking/game_client.gd.uid b/scripts/controllers/networking/game_client.gd.uid similarity index 100% rename from controllers/networking/game_client.gd.uid rename to scripts/controllers/networking/game_client.gd.uid diff --git a/controllers/networking/game_client.tscn b/scripts/controllers/networking/game_client.tscn similarity index 75% rename from controllers/networking/game_client.tscn rename to scripts/controllers/networking/game_client.tscn index 1cd6228..1d4e2ae 100644 --- a/controllers/networking/game_client.tscn +++ b/scripts/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://controllers/networking/game_client.gd" id="1_tea1p"] +[ext_resource type="Script" uid="uid://cjtu1d1j35r32" path="res://scripts/controllers/networking/game_client.gd" id="1_tea1p"] [node name="client_net" type="Node"] script = ExtResource("1_tea1p") diff --git a/controllers/networking/game_server.gd b/scripts/controllers/networking/game_server.gd similarity index 100% rename from controllers/networking/game_server.gd rename to scripts/controllers/networking/game_server.gd diff --git a/controllers/networking/game_server.gd.uid b/scripts/controllers/networking/game_server.gd.uid similarity index 100% rename from controllers/networking/game_server.gd.uid rename to scripts/controllers/networking/game_server.gd.uid diff --git a/controllers/networking/game_server.tscn b/scripts/controllers/networking/game_server.tscn similarity index 75% rename from controllers/networking/game_server.tscn rename to scripts/controllers/networking/game_server.tscn index 548c85b..29115c7 100644 --- a/controllers/networking/game_server.tscn +++ b/scripts/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://controllers/networking/game_server.gd" id="1_3xapr"] +[ext_resource type="Script" uid="uid://bndylf4rwtlkn" path="res://scripts/controllers/networking/game_server.gd" id="1_3xapr"] [node name="server_net" type="Node"] script = ExtResource("1_3xapr") diff --git a/scenes/data/data_bridge.tscn b/scripts/data/data_bridge.tscn similarity index 79% rename from scenes/data/data_bridge.tscn rename to scripts/data/data_bridge.tscn index 4f0c8fd..c91bc65 100644 --- a/scenes/data/data_bridge.tscn +++ b/scripts/data/data_bridge.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://dy51wny4x53f4"] -[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"] +[ext_resource type="Script" uid="uid://52eithlmedm3" path="res://scripts/data/game_data.gd" id="1_hulqm"] +[ext_resource type="Script" uid="uid://dvw46rvml3ec" path="res://scripts/data/game_state.gd" id="2_6ash1"] +[ext_resource type="Script" uid="uid://6sfwe1hwgf0g" path="res://scripts/data/lobby_data.gd" id="3_80q4n"] +[ext_resource type="Script" uid="uid://bs4vblwa3u5jq" path="res://scripts/data/multiplayer_data.gd" id="4_setx2"] [node name="data_bridge" type="Node"] diff --git a/scenes/data/game_data.gd b/scripts/data/game_data.gd similarity index 100% rename from scenes/data/game_data.gd rename to scripts/data/game_data.gd diff --git a/scenes/data/game_data.gd.uid b/scripts/data/game_data.gd.uid similarity index 100% rename from scenes/data/game_data.gd.uid rename to scripts/data/game_data.gd.uid diff --git a/scenes/data/game_state.gd b/scripts/data/game_state.gd similarity index 100% rename from scenes/data/game_state.gd rename to scripts/data/game_state.gd diff --git a/scenes/data/game_state.gd.uid b/scripts/data/game_state.gd.uid similarity index 100% rename from scenes/data/game_state.gd.uid rename to scripts/data/game_state.gd.uid diff --git a/scenes/data/lobby_data.gd b/scripts/data/lobby_data.gd similarity index 100% rename from scenes/data/lobby_data.gd rename to scripts/data/lobby_data.gd diff --git a/scenes/data/lobby_data.gd.uid b/scripts/data/lobby_data.gd.uid similarity index 100% rename from scenes/data/lobby_data.gd.uid rename to scripts/data/lobby_data.gd.uid diff --git a/scenes/data/multiplayer_data.gd b/scripts/data/multiplayer_data.gd similarity index 100% rename from scenes/data/multiplayer_data.gd rename to scripts/data/multiplayer_data.gd diff --git a/scenes/data/multiplayer_data.gd.uid b/scripts/data/multiplayer_data.gd.uid similarity index 100% rename from scenes/data/multiplayer_data.gd.uid rename to scripts/data/multiplayer_data.gd.uid