From 4db7e652cb711c0ecec44816d7d4e034057ae3fa Mon Sep 17 00:00:00 2001 From: TheThomaas Date: Sun, 4 Oct 2026 17:47:39 +0200 Subject: [PATCH] Move scenes into separate folders --- {scripts => game/ui/main_menu}/main_menu.gd | 2 +- .../ui/main_menu}/main_menu.gd.uid | 0 {scenes => game/ui/main_menu}/main_menu.tscn | 2 +- {scripts => game/ui/pause_menu}/pause_menu.gd | 0 .../ui/pause_menu}/pause_menu.gd.uid | 0 .../ui/pause_menu}/pause_menu.tscn | 2 +- .../ui/splash_screen}/splash_screen.gd | 2 +- .../ui/splash_screen}/splash_screen.gd.uid | 0 .../ui/splash_screen}/splash_screen.tscn | 2 +- {scenes => game/world}/main.tscn | 2 +- scenes/main_menu.tscn6324169466.tmp | 109 ------------------ scenes/main_menu.tscn6333752743.tmp | 109 ------------------ scenes/main_menu.tscn6356094100.tmp | 109 ------------------ 13 files changed, 6 insertions(+), 333 deletions(-) rename {scripts => game/ui/main_menu}/main_menu.gd (97%) rename {scripts => game/ui/main_menu}/main_menu.gd.uid (100%) rename {scenes => game/ui/main_menu}/main_menu.tscn (99%) rename {scripts => game/ui/pause_menu}/pause_menu.gd (100%) rename {scripts => game/ui/pause_menu}/pause_menu.gd.uid (100%) rename {scenes => game/ui/pause_menu}/pause_menu.tscn (99%) rename {scripts => game/ui/splash_screen}/splash_screen.gd (92%) rename {scripts => game/ui/splash_screen}/splash_screen.gd.uid (100%) rename {scenes => game/ui/splash_screen}/splash_screen.tscn (94%) rename {scenes => game/world}/main.tscn (99%) delete mode 100644 scenes/main_menu.tscn6324169466.tmp delete mode 100644 scenes/main_menu.tscn6333752743.tmp delete mode 100644 scenes/main_menu.tscn6356094100.tmp diff --git a/scripts/main_menu.gd b/game/ui/main_menu/main_menu.gd similarity index 97% rename from scripts/main_menu.gd rename to game/ui/main_menu/main_menu.gd index 77c7916..98cb2b4 100644 --- a/scripts/main_menu.gd +++ b/game/ui/main_menu/main_menu.gd @@ -12,7 +12,7 @@ extends Node @export var menu_music: AudioStream @export var start_click_sound: AudioStream -const GAME_SCENE_PATH := "res://scenes/main.tscn" +const GAME_SCENE_PATH := "res://game/world/main.tscn" const MUSIC_FADE_DURATION := 0.8 const SCREEN_FADE_DURATION := 0.6 diff --git a/scripts/main_menu.gd.uid b/game/ui/main_menu/main_menu.gd.uid similarity index 100% rename from scripts/main_menu.gd.uid rename to game/ui/main_menu/main_menu.gd.uid diff --git a/scenes/main_menu.tscn b/game/ui/main_menu/main_menu.tscn similarity index 99% rename from scenes/main_menu.tscn rename to game/ui/main_menu/main_menu.tscn index abadbc0..c9f3d0e 100644 --- a/scenes/main_menu.tscn +++ b/game/ui/main_menu/main_menu.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bluq6da7tku3d"] -[ext_resource type="Script" uid="uid://cj37ns1ahfvhr" path="res://scripts/main_menu.gd" id="1_ekxnf"] +[ext_resource type="Script" uid="uid://cj37ns1ahfvhr" path="res://game/ui/main_menu/main_menu.gd" id="1_ekxnf"] [ext_resource type="Script" uid="uid://7hglx6nfu063" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_bqqt6"] [ext_resource type="Texture2D" uid="uid://d23fefvrd41re" path="res://assets/textures/background/0.png" id="2_wu84c"] diff --git a/scripts/pause_menu.gd b/game/ui/pause_menu/pause_menu.gd similarity index 100% rename from scripts/pause_menu.gd rename to game/ui/pause_menu/pause_menu.gd diff --git a/scripts/pause_menu.gd.uid b/game/ui/pause_menu/pause_menu.gd.uid similarity index 100% rename from scripts/pause_menu.gd.uid rename to game/ui/pause_menu/pause_menu.gd.uid diff --git a/scenes/pause_menu.tscn b/game/ui/pause_menu/pause_menu.tscn similarity index 99% rename from scenes/pause_menu.tscn rename to game/ui/pause_menu/pause_menu.tscn index f522832..78e6d03 100644 --- a/scenes/pause_menu.tscn +++ b/game/ui/pause_menu/pause_menu.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://d1mcef8gl66j"] [ext_resource type="Shader" uid="uid://dg3j314tijk1e" path="res://pause_menu.gdshader" id="1_hdmo1"] -[ext_resource type="Script" uid="uid://bu3n6rboirk5r" path="res://scripts/pause_menu.gd" id="1_kukqi"] +[ext_resource type="Script" uid="uid://bu3n6rboirk5r" path="res://game/ui/pause_menu/pause_menu.gd" id="1_kukqi"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_3agn1"] shader = ExtResource("1_hdmo1") diff --git a/scripts/splash_screen.gd b/game/ui/splash_screen/splash_screen.gd similarity index 92% rename from scripts/splash_screen.gd rename to game/ui/splash_screen/splash_screen.gd index d3c1dbc..44a6940 100644 --- a/scripts/splash_screen.gd +++ b/game/ui/splash_screen/splash_screen.gd @@ -3,7 +3,7 @@ extends Control @onready var animated_display: TextureRect = %AnimatedDisplay @onready var transition_rect: ColorRect = %TransitionRect -@export var main_menu_scene_path : String = "res://scenes/main_menu.tscn" +@export var main_menu_scene_path : String = "res://game/ui/main_menu/main_menu.tscn" @export var splash_duration : float = 3.0 @export var allow_skip : bool = true diff --git a/scripts/splash_screen.gd.uid b/game/ui/splash_screen/splash_screen.gd.uid similarity index 100% rename from scripts/splash_screen.gd.uid rename to game/ui/splash_screen/splash_screen.gd.uid diff --git a/scenes/splash_screen.tscn b/game/ui/splash_screen/splash_screen.tscn similarity index 94% rename from scenes/splash_screen.tscn rename to game/ui/splash_screen/splash_screen.tscn index ed56730..0dc4c35 100644 --- a/scenes/splash_screen.tscn +++ b/game/ui/splash_screen/splash_screen.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bi3r04lqth7iq"] -[ext_resource type="Script" uid="uid://ddxoruhyuxesc" path="res://scripts/splash_screen.gd" id="1_hsxvm"] +[ext_resource type="Script" uid="uid://ddxoruhyuxesc" path="res://game/ui/splash_screen/splash_screen.gd" id="1_hsxvm"] [ext_resource type="Texture2D" uid="uid://c28nuhy3im7y4" path="res://assets/textures/splash.png" id="2_4gp4q"] [node name="SplashScreen" type="Control" unique_id=300161700] diff --git a/scenes/main.tscn b/game/world/main.tscn similarity index 99% rename from scenes/main.tscn rename to game/world/main.tscn index eaf3e54..0309ce7 100644 --- a/scenes/main.tscn +++ b/game/world/main.tscn @@ -7,7 +7,7 @@ [ext_resource type="Texture2D" uid="uid://hu5rfl6qr2nv" path="res://assets/textures/grids/Red/texture_09.png" id="5_o6xl0"] [ext_resource type="Script" uid="uid://ce2wj6d8xb055" path="res://game/player/aim/aim_target.gd" id="6_85g3d"] [ext_resource type="PackedScene" uid="uid://dwxpt0s7vn36k" path="res://game/player/player_character.tscn" id="6_o6xl0"] -[ext_resource type="PackedScene" uid="uid://d1mcef8gl66j" path="res://scenes/pause_menu.tscn" id="6_tefeu"] +[ext_resource type="PackedScene" uid="uid://d1mcef8gl66j" path="res://game/ui/pause_menu/pause_menu.tscn" id="6_tefeu"] [ext_resource type="PackedScene" uid="uid://di22cs2qposdm" path="res://game/ui/hud/ui.tscn" id="8_tipki"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_tipki"] diff --git a/scenes/main_menu.tscn6324169466.tmp b/scenes/main_menu.tscn6324169466.tmp deleted file mode 100644 index 06abe40..0000000 --- a/scenes/main_menu.tscn6324169466.tmp +++ /dev/null @@ -1,109 +0,0 @@ -[gd_scene format=3 uid="uid://bluq6da7tku3d"] - -[ext_resource type="Script" uid="uid://cj37ns1ahfvhr" path="res://scripts/main_menu.gd" id="1_ekxnf"] -[ext_resource type="Script" uid="uid://7hglx6nfu063" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_bqqt6"] -[ext_resource type="Texture2D" uid="uid://d23fefvrd41re" path="res://assets/textures/background/0.png" id="2_wu84c"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_bqqt6"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ekxnf"] - -[sub_resource type="Texture2D" id="Texture2D_wu84c"] -resource_local_to_scene = false -resource_name = "" -script = ExtResource("2_bqqt6") -path = "ui_accept" -metadata/_custom_type_script = "uid://7hglx6nfu063" - -[sub_resource type="LabelSettings" id="LabelSettings_3agn1"] -font_size = 64 - -[node name="MainMenu" type="Control" unique_id=1471802333] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_ekxnf") -progression_backgrounds = Array[Texture2D]([ExtResource("2_wu84c")]) - -[node name="Background" type="TextureRect" parent="." unique_id=545049912] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -expand_mode = 1 -stretch_mode = 6 - -[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1404024715] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -571.0 -offset_top = -323.5 -offset_bottom = 323.5 -grow_horizontal = 0 -grow_vertical = 2 - -[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1437260283] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -130.0 -offset_top = -67.0 -grow_horizontal = 0 -grow_vertical = 0 -theme_override_constants/margin_right = 200 -theme_override_constants/margin_bottom = 150 - -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=212717997] -layout_mode = 2 - -[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/VBoxContainer" unique_id=455366583] -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxEmpty_bqqt6") - -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/PanelContainer" unique_id=980574030] -layout_mode = 2 - -[node name="Start" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=1823965781] -unique_name_in_owner = true -layout_mode = 2 -theme_override_styles/focus = SubResource("StyleBoxEmpty_ekxnf") -text = "Appuyer sur" -flat = true -icon_alignment = 2 - -[node name="TextureRect" type="TextureRect" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=544893863] -custom_minimum_size = Vector2(40, 40) -layout_mode = 2 -size_flags_vertical = 3 -texture = SubResource("Texture2D_wu84c") -expand_mode = 1 - -[node name="Label" type="Label" parent="." unique_id=745232782] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -489.0 -offset_top = -185.0 -offset_right = -45.0 -offset_bottom = -97.0 -grow_horizontal = 0 -grow_vertical = 2 -text = "Tales of PKMN" -label_settings = SubResource("LabelSettings_3agn1") - -[connection signal="pressed" from="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer/Start" to="." method="_on_start_pressed"] diff --git a/scenes/main_menu.tscn6333752743.tmp b/scenes/main_menu.tscn6333752743.tmp deleted file mode 100644 index 06abe40..0000000 --- a/scenes/main_menu.tscn6333752743.tmp +++ /dev/null @@ -1,109 +0,0 @@ -[gd_scene format=3 uid="uid://bluq6da7tku3d"] - -[ext_resource type="Script" uid="uid://cj37ns1ahfvhr" path="res://scripts/main_menu.gd" id="1_ekxnf"] -[ext_resource type="Script" uid="uid://7hglx6nfu063" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_bqqt6"] -[ext_resource type="Texture2D" uid="uid://d23fefvrd41re" path="res://assets/textures/background/0.png" id="2_wu84c"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_bqqt6"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ekxnf"] - -[sub_resource type="Texture2D" id="Texture2D_wu84c"] -resource_local_to_scene = false -resource_name = "" -script = ExtResource("2_bqqt6") -path = "ui_accept" -metadata/_custom_type_script = "uid://7hglx6nfu063" - -[sub_resource type="LabelSettings" id="LabelSettings_3agn1"] -font_size = 64 - -[node name="MainMenu" type="Control" unique_id=1471802333] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_ekxnf") -progression_backgrounds = Array[Texture2D]([ExtResource("2_wu84c")]) - -[node name="Background" type="TextureRect" parent="." unique_id=545049912] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -expand_mode = 1 -stretch_mode = 6 - -[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1404024715] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -571.0 -offset_top = -323.5 -offset_bottom = 323.5 -grow_horizontal = 0 -grow_vertical = 2 - -[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1437260283] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -130.0 -offset_top = -67.0 -grow_horizontal = 0 -grow_vertical = 0 -theme_override_constants/margin_right = 200 -theme_override_constants/margin_bottom = 150 - -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=212717997] -layout_mode = 2 - -[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/VBoxContainer" unique_id=455366583] -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxEmpty_bqqt6") - -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/PanelContainer" unique_id=980574030] -layout_mode = 2 - -[node name="Start" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=1823965781] -unique_name_in_owner = true -layout_mode = 2 -theme_override_styles/focus = SubResource("StyleBoxEmpty_ekxnf") -text = "Appuyer sur" -flat = true -icon_alignment = 2 - -[node name="TextureRect" type="TextureRect" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=544893863] -custom_minimum_size = Vector2(40, 40) -layout_mode = 2 -size_flags_vertical = 3 -texture = SubResource("Texture2D_wu84c") -expand_mode = 1 - -[node name="Label" type="Label" parent="." unique_id=745232782] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -489.0 -offset_top = -185.0 -offset_right = -45.0 -offset_bottom = -97.0 -grow_horizontal = 0 -grow_vertical = 2 -text = "Tales of PKMN" -label_settings = SubResource("LabelSettings_3agn1") - -[connection signal="pressed" from="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer/Start" to="." method="_on_start_pressed"] diff --git a/scenes/main_menu.tscn6356094100.tmp b/scenes/main_menu.tscn6356094100.tmp deleted file mode 100644 index 06abe40..0000000 --- a/scenes/main_menu.tscn6356094100.tmp +++ /dev/null @@ -1,109 +0,0 @@ -[gd_scene format=3 uid="uid://bluq6da7tku3d"] - -[ext_resource type="Script" uid="uid://cj37ns1ahfvhr" path="res://scripts/main_menu.gd" id="1_ekxnf"] -[ext_resource type="Script" uid="uid://7hglx6nfu063" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_bqqt6"] -[ext_resource type="Texture2D" uid="uid://d23fefvrd41re" path="res://assets/textures/background/0.png" id="2_wu84c"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_bqqt6"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ekxnf"] - -[sub_resource type="Texture2D" id="Texture2D_wu84c"] -resource_local_to_scene = false -resource_name = "" -script = ExtResource("2_bqqt6") -path = "ui_accept" -metadata/_custom_type_script = "uid://7hglx6nfu063" - -[sub_resource type="LabelSettings" id="LabelSettings_3agn1"] -font_size = 64 - -[node name="MainMenu" type="Control" unique_id=1471802333] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_ekxnf") -progression_backgrounds = Array[Texture2D]([ExtResource("2_wu84c")]) - -[node name="Background" type="TextureRect" parent="." unique_id=545049912] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -expand_mode = 1 -stretch_mode = 6 - -[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1404024715] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -571.0 -offset_top = -323.5 -offset_bottom = 323.5 -grow_horizontal = 0 -grow_vertical = 2 - -[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1437260283] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -130.0 -offset_top = -67.0 -grow_horizontal = 0 -grow_vertical = 0 -theme_override_constants/margin_right = 200 -theme_override_constants/margin_bottom = 150 - -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=212717997] -layout_mode = 2 - -[node name="PanelContainer" type="PanelContainer" parent="MarginContainer/VBoxContainer" unique_id=455366583] -layout_mode = 2 -theme_override_styles/panel = SubResource("StyleBoxEmpty_bqqt6") - -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/PanelContainer" unique_id=980574030] -layout_mode = 2 - -[node name="Start" type="Button" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=1823965781] -unique_name_in_owner = true -layout_mode = 2 -theme_override_styles/focus = SubResource("StyleBoxEmpty_ekxnf") -text = "Appuyer sur" -flat = true -icon_alignment = 2 - -[node name="TextureRect" type="TextureRect" parent="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer" unique_id=544893863] -custom_minimum_size = Vector2(40, 40) -layout_mode = 2 -size_flags_vertical = 3 -texture = SubResource("Texture2D_wu84c") -expand_mode = 1 - -[node name="Label" type="Label" parent="." unique_id=745232782] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -489.0 -offset_top = -185.0 -offset_right = -45.0 -offset_bottom = -97.0 -grow_horizontal = 0 -grow_vertical = 2 -text = "Tales of PKMN" -label_settings = SubResource("LabelSettings_3agn1") - -[connection signal="pressed" from="MarginContainer/VBoxContainer/PanelContainer/HBoxContainer/Start" to="." method="_on_start_pressed"]