diff --git a/scenes/menu/about.gd b/menu/about.gd similarity index 66% rename from scenes/menu/about.gd rename to menu/about.gd index 38cd494..476b8d8 100644 --- a/scenes/menu/about.gd +++ b/menu/about.gd @@ -2,7 +2,7 @@ extends Panel func _on_BackButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/main_menu.tscn") + get_tree().change_scene("res://menu/main_menu.tscn") func _on_link_meta_clicked(meta) -> void: diff --git a/scenes/menu/about.tscn b/menu/about.tscn similarity index 99% rename from scenes/menu/about.tscn rename to menu/about.tscn index 4898214..2c19862 100644 --- a/scenes/menu/about.tscn +++ b/menu/about.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://scenes/menu/about.gd" type="Script" id=1] +[ext_resource path="res://menu/about.gd" type="Script" id=1] [ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=2] [sub_resource type="DynamicFont" id=1] diff --git a/scenes/menu/main_menu.gd b/menu/main_menu.gd similarity index 69% rename from scenes/menu/main_menu.gd rename to menu/main_menu.gd index 201afbe..07e6150 100644 --- a/scenes/menu/main_menu.gd +++ b/menu/main_menu.gd @@ -4,16 +4,16 @@ func _ready() -> void: $MarginContainer/VSplitContainer/VSplitContainer/CenterContainer/VBoxContainer/StartButton.grab_focus() func _on_StartButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/start_menu.tscn") + get_tree().change_scene("res://menu/start_menu.tscn") func _on_ExitButton_pressed() -> void: get_tree().quit() func _on_SettingsButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/settings_menu.tscn") + get_tree().change_scene("res://menu/settings_menu.tscn") func _on_AboutButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/about.tscn") + get_tree().change_scene("res://menu/about.tscn") func _on_GodotButton_pressed() -> void: OS.shell_open("https://godotengine.org") diff --git a/scenes/menu/main_menu.tscn b/menu/main_menu.tscn similarity index 95% rename from scenes/menu/main_menu.tscn rename to menu/main_menu.tscn index 7055cc2..c0462c3 100644 --- a/scenes/menu/main_menu.tscn +++ b/menu/main_menu.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://scenes/menu/main_menu.gd" type="Script" id=1] -[ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://menu/main_menu.gd" type="Script" id=2] [ext_resource path="res://icon.png" type="Texture" id=3] [sub_resource type="DynamicFont" id=1] size = 64 -font_data = ExtResource( 2 ) +font_data = ExtResource( 1 ) [sub_resource type="DynamicFont" id=2] size = 32 -font_data = ExtResource( 2 ) +font_data = ExtResource( 1 ) [node name="MainMenu" type="Panel"] anchor_right = 1.0 anchor_bottom = 1.0 -script = ExtResource( 1 ) +script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/scenes/menu/pause_menu.gd b/menu/pause_menu.gd similarity index 87% rename from scenes/menu/pause_menu.gd rename to menu/pause_menu.gd index 9d45a10..a24e403 100644 --- a/scenes/menu/pause_menu.gd +++ b/menu/pause_menu.gd @@ -18,5 +18,5 @@ func _on_ContinueButton_pressed(): func _on_ExitButton_pressed(): get_tree().paused = false - get_tree().change_scene("res://scenes/menu/main_menu.tscn") + get_tree().change_scene("res://menu/main_menu.tscn") get_tree().root.get_child(get_tree().root.get_child_count() - 1).queue_free() diff --git a/scenes/menu/pause_menu.tscn b/menu/pause_menu.tscn similarity index 96% rename from scenes/menu/pause_menu.tscn rename to menu/pause_menu.tscn index 6dee2f0..b05a387 100644 --- a/scenes/menu/pause_menu.tscn +++ b/menu/pause_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://scenes/menu/pause_menu.gd" type="Script" id=2] +[ext_resource path="res://menu/pause_menu.gd" type="Script" id=2] [sub_resource type="DynamicFont" id=1] font_data = ExtResource( 1 ) diff --git a/scenes/menu/settings_menu.gd b/menu/settings_menu.gd similarity index 98% rename from scenes/menu/settings_menu.gd rename to menu/settings_menu.gd index 24a3578..dae05b3 100644 --- a/scenes/menu/settings_menu.gd +++ b/menu/settings_menu.gd @@ -52,7 +52,7 @@ func _on_automatictransmission_toggled(new_state: bool) -> void: func _on_BackButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/main_menu.tscn") + get_tree().change_scene("res://menu/main_menu.tscn") func _on_MasterSlider_value_changed(new_value: float) -> void: diff --git a/scenes/menu/settings_menu.tscn b/menu/settings_menu.tscn similarity index 98% rename from scenes/menu/settings_menu.tscn rename to menu/settings_menu.tscn index cbdcc91..34db8db 100644 --- a/scenes/menu/settings_menu.tscn +++ b/menu/settings_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://scenes/menu/settings_menu.gd" type="Script" id=2] +[ext_resource path="res://menu/settings_menu.gd" type="Script" id=2] [sub_resource type="DynamicFont" id=1] size = 64 diff --git a/scenes/menu/start_menu.gd b/menu/start_menu.gd similarity index 96% rename from scenes/menu/start_menu.gd rename to menu/start_menu.gd index 5bd0c40..eb82131 100644 --- a/scenes/menu/start_menu.gd +++ b/menu/start_menu.gd @@ -41,4 +41,4 @@ func _start_track_with_vehicle(track: Node, vehicle: Node) -> void: queue_free() func _on_BackButton_pressed() -> void: - get_tree().change_scene("res://scenes/menu/main_menu.tscn") + get_tree().change_scene("res://menu/main_menu.tscn") diff --git a/scenes/menu/start_menu.tscn b/menu/start_menu.tscn similarity index 97% rename from scenes/menu/start_menu.tscn rename to menu/start_menu.tscn index dd1ee97..40682cf 100644 --- a/scenes/menu/start_menu.tscn +++ b/menu/start_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://scenes/menu/start_menu.gd" type="Script" id=2] +[ext_resource path="res://menu/start_menu.gd" type="Script" id=2] [sub_resource type="DynamicFont" id=1] size = 64 diff --git a/project.godot b/project.godot index b12ec79..e7542cb 100644 --- a/project.godot +++ b/project.godot @@ -27,7 +27,7 @@ _global_script_class_icons={ [application] config/name="bugged-racing" -run/main_scene="res://scenes/menu/main_menu.tscn" +run/main_scene="res://menu/main_menu.tscn" boot_splash/image="res://assets/bugged-racing-cover.png" config/icon="res://icon.png" diff --git a/scenes/test_level.tscn b/scenes/test_level.tscn index 382c80c..07c96ff 100644 --- a/scenes/test_level.tscn +++ b/scenes/test_level.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=16 format=2] [ext_resource path="res://scenes/test_level.gd" type="Script" id=1] -[ext_resource path="res://scenes/menu/pause_menu.tscn" type="PackedScene" id=2] +[ext_resource path="res://menu/pause_menu.tscn" type="PackedScene" id=2] [ext_resource path="res://icon.png" type="Texture" id=3] [ext_resource path="res://scenes/track.gd" type="Script" id=4] [ext_resource path="res://assets/fonts/kenney-future-narrow.ttf" type="DynamicFontData" id=5] diff --git a/vehicles/beetlecar.tscn b/vehicles/beetlecar.tscn index 23c0f08..f5a886e 100644 --- a/vehicles/beetlecar.tscn +++ b/vehicles/beetlecar.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://vehicles/buggy.gd" type="Script" id=1] +[ext_resource path="res://vehicles/vehicle.gd" type="Script" id=1] [ext_resource path="res://assets/beetlecar.glb" type="PackedScene" id=2] [ext_resource path="res://vehicles/tire_smoke.tscn" type="PackedScene" id=3] diff --git a/vehicles/buggy.tscn b/vehicles/buggy.tscn index 82f02c0..e1e27f9 100644 --- a/vehicles/buggy.tscn +++ b/vehicles/buggy.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/basic_buggy.glb" type="PackedScene" id=1] [ext_resource path="res://vehicles/tire_smoke.tscn" type="PackedScene" id=2] -[ext_resource path="res://vehicles/buggy.gd" type="Script" id=3] +[ext_resource path="res://vehicles/vehicle.gd" type="Script" id=3] [sub_resource type="Curve" id=2] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.0660377, 0.243255 ), 0.0, 0.0, 0, 0, Vector2( 0.240566, 0.315982 ), 0.0, 0.0, 0, 0, Vector2( 0.45283, 0.927273 ), 0.0, 0.0, 0, 0, Vector2( 0.891509, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] diff --git a/vehicles/bugmobile.tscn b/vehicles/bugmobile.tscn index 3f27cec..a69739c 100644 --- a/vehicles/bugmobile.tscn +++ b/vehicles/bugmobile.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://vehicles/tire_smoke.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/bugmobile.glb" type="PackedScene" id=2] -[ext_resource path="res://vehicles/buggy.gd" type="Script" id=3] +[ext_resource path="res://vehicles/vehicle.gd" type="Script" id=3] [sub_resource type="Curve" id=18] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.103774, 0.493182 ), 0.0, 0.0, 0, 0, Vector2( 0.339623, 0.629545 ), 0.0, 0.0, 0, 0, Vector2( 0.806604, 0.989773 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] diff --git a/vehicles/buggy.gd b/vehicles/vehicle.gd similarity index 100% rename from vehicles/buggy.gd rename to vehicles/vehicle.gd