From 1373aaf7480db3e757928e6a87d4faf55bb9008b Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sat, 25 Feb 2023 19:04:42 +0100 Subject: [PATCH] Update filenames --- Scenes/Button_Node2D.gd | 2 +- Scenes/{Node2D.tscn => DesktopScreen.tscn} | 24 ++++++++-------- Scenes/GameOver.gd | 2 +- Scenes/Screen_Menu.gd | 2 +- Scenes/gameover.tscn | 8 +++--- Scenes/menu.tscn | 32 +++++++++++----------- project.godot | 2 +- 7 files changed, 36 insertions(+), 36 deletions(-) rename Scenes/{Node2D.tscn => DesktopScreen.tscn} (77%) diff --git a/Scenes/Button_Node2D.gd b/Scenes/Button_Node2D.gd index 7abdc11..e68b9d0 100755 --- a/Scenes/Button_Node2D.gd +++ b/Scenes/Button_Node2D.gd @@ -12,7 +12,7 @@ const texture_released = preload("res://Assets/skin_assets/button_pressed.png") func _process(_delta): if etat: if villain.animation == villain_animations[-1]: - get_tree().change_scene("res://Scenes/gameover.tscn") + get_tree().change_scene("res://Scenes/GameOver.tscn") func _on_Button_pressed(): diff --git a/Scenes/Node2D.tscn b/Scenes/DesktopScreen.tscn similarity index 77% rename from Scenes/Node2D.tscn rename to Scenes/DesktopScreen.tscn index ccb0381..3600e70 100755 --- a/Scenes/Node2D.tscn +++ b/Scenes/DesktopScreen.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Characters/Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://Characters/Villain.tscn" type="PackedScene" id=2] +[ext_resource path="res://Characters/Villain.tscn" type="PackedScene" id=1] +[ext_resource path="res://Characters/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://Scenes/Button_Node2D.gd" type="Script" id=3] -[ext_resource path="res://Assets/windows.png" type="Texture" id=4] -[ext_resource path="res://Assets/tres_button/hover.tres" type="StyleBox" id=5] -[ext_resource path="res://Assets/tres_button/normal.tres" type="StyleBox" id=6] -[ext_resource path="res://Assets/tres_button/pressed.tres" type="StyleBox" id=7] +[ext_resource path="res://Assets/tres_button/normal.tres" type="StyleBox" id=4] +[ext_resource path="res://Assets/tres_button/pressed.tres" type="StyleBox" id=5] +[ext_resource path="res://Assets/tres_button/hover.tres" type="StyleBox" id=6] +[ext_resource path="res://Assets/windows.png" type="Texture" id=7] [sub_resource type="Theme" id=1] [node name="Node2D" type="Node2D"] -[node name="Player" parent="." instance=ExtResource( 1 )] +[node name="Player" parent="." instance=ExtResource( 2 )] visible = false position = Vector2( 719, 386 ) script = null @@ -24,13 +24,13 @@ margin_right = 592.0 margin_bottom = 395.0 theme = SubResource( 1 ) custom_colors/font_color = Color( 0.27451, 0.207843, 0.207843, 1 ) -custom_styles/hover = ExtResource( 5 ) -custom_styles/pressed = ExtResource( 7 ) -custom_styles/normal = ExtResource( 6 ) +custom_styles/hover = ExtResource( 6 ) +custom_styles/pressed = ExtResource( 5 ) +custom_styles/normal = ExtResource( 4 ) text = "CLIQUE MOI" script = ExtResource( 3 ) -[node name="Villain" parent="." instance=ExtResource( 2 )] +[node name="Villain" parent="." instance=ExtResource( 1 )] position = Vector2( 871, 589 ) scale = Vector2( 0.2, 0.2 ) @@ -38,6 +38,6 @@ scale = Vector2( 0.2, 0.2 ) visible = false position = Vector2( 512, 358 ) z_index = -3 -texture = ExtResource( 4 ) +texture = ExtResource( 7 ) [connection signal="pressed" from="Button" to="Button" method="_on_Button_pressed"] diff --git a/Scenes/GameOver.gd b/Scenes/GameOver.gd index 8d8a17d..6fba334 100755 --- a/Scenes/GameOver.gd +++ b/Scenes/GameOver.gd @@ -2,4 +2,4 @@ extends Node2D func _on_RestartButton_pressed(): - get_tree().change_scene("res://Scenes/menu.tscn") + get_tree().change_scene("res://Scenes/Menu.tscn") diff --git a/Scenes/Screen_Menu.gd b/Scenes/Screen_Menu.gd index b318f27..42187fc 100755 --- a/Scenes/Screen_Menu.gd +++ b/Scenes/Screen_Menu.gd @@ -2,7 +2,7 @@ extends Control func _on_PlayButton_pressed(): - get_tree().change_scene("res://Scenes/Node2D.tscn") + get_tree().change_scene("res://Scenes/DesktopScreen.tscn") func _on_Help_Button_pressed(): diff --git a/Scenes/gameover.tscn b/Scenes/gameover.tscn index 1dfc627..6176d96 100755 --- a/Scenes/gameover.tscn +++ b/Scenes/gameover.tscn @@ -1,19 +1,19 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Assets/windows.png" type="Texture" id=1] +[ext_resource path="res://Scenes/GameOver.gd" type="Script" id=1] [ext_resource path="res://Assets/skin_assets/menu_font.tres" type="DynamicFont" id=2] [ext_resource path="res://Assets/tres_button/normal.tres" type="StyleBox" id=3] [ext_resource path="res://Assets/tres_button/pressed.tres" type="StyleBox" id=4] [ext_resource path="res://Assets/tres_button/hover.tres" type="StyleBox" id=5] -[ext_resource path="res://Scenes/GameOver.gd" type="Script" id=6] +[ext_resource path="res://Assets/windows.png" type="Texture" id=6] [node name="Node2D" type="Node2D"] -script = ExtResource( 6 ) +script = ExtResource( 1 ) [node name="Windows" type="Sprite" parent="."] position = Vector2( 512, 360 ) z_index = -2 -texture = ExtResource( 1 ) +texture = ExtResource( 6 ) [node name="LabelGameOver" type="Label" parent="."] margin_left = 427.0 diff --git a/Scenes/menu.tscn b/Scenes/menu.tscn index 483276f..5dd75f7 100755 --- a/Scenes/menu.tscn +++ b/Scenes/menu.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Assets/windows.png" type="Texture" id=1] +[ext_resource path="res://Scenes/Screen_Menu.gd" type="Script" id=1] [ext_resource path="res://Assets/skin_assets/menu_font.tres" type="DynamicFont" id=2] -[ext_resource path="res://Assets/tres_button/hover.tres" type="StyleBox" id=3] -[ext_resource path="res://Assets/tres_button/normal.tres" type="StyleBox" id=4] -[ext_resource path="res://Assets/tres_button/pressed.tres" type="StyleBox" id=5] -[ext_resource path="res://Scenes/Screen_Menu.gd" type="Script" id=6] +[ext_resource path="res://Assets/tres_button/normal.tres" type="StyleBox" id=3] +[ext_resource path="res://Assets/tres_button/pressed.tres" type="StyleBox" id=4] +[ext_resource path="res://Assets/tres_button/hover.tres" type="StyleBox" id=5] +[ext_resource path="res://Assets/windows.png" type="Texture" id=6] [node name="Node2D" type="Node2D"] [node name="Windows" type="Sprite" parent="."] position = Vector2( 512, 360 ) z_index = -2 -texture = ExtResource( 1 ) +texture = ExtResource( 6 ) [node name="MenuButton" type="MenuButton" parent="."] margin_left = 480.0 margin_top = 232.0 margin_right = 584.0 margin_bottom = 392.0 -script = ExtResource( 6 ) +script = ExtResource( 1 ) [node name="VBoxContainer" type="VBoxContainer" parent="MenuButton"] margin_left = -24.0 @@ -34,9 +34,9 @@ margin_right = 100.0 margin_bottom = 37.0 custom_colors/font_color = Color( 0.34902, 0.313726, 0.313726, 1 ) custom_fonts/font = ExtResource( 2 ) -custom_styles/hover = ExtResource( 3 ) -custom_styles/pressed = ExtResource( 5 ) -custom_styles/normal = ExtResource( 4 ) +custom_styles/hover = ExtResource( 5 ) +custom_styles/pressed = ExtResource( 4 ) +custom_styles/normal = ExtResource( 3 ) text = "PLAY" [node name="Help_Button" type="Button" parent="MenuButton/VBoxContainer"] @@ -45,9 +45,9 @@ margin_right = 100.0 margin_bottom = 100.0 custom_colors/font_color = Color( 0.34902, 0.313726, 0.313726, 1 ) custom_fonts/font = ExtResource( 2 ) -custom_styles/hover = ExtResource( 3 ) -custom_styles/pressed = ExtResource( 5 ) -custom_styles/normal = ExtResource( 4 ) +custom_styles/hover = ExtResource( 5 ) +custom_styles/pressed = ExtResource( 4 ) +custom_styles/normal = ExtResource( 3 ) text = "HELP" [node name="Quit_Button" type="Button" parent="MenuButton/VBoxContainer"] @@ -56,9 +56,9 @@ margin_right = 100.0 margin_bottom = 163.0 custom_colors/font_color = Color( 0.34902, 0.313726, 0.313726, 1 ) custom_fonts/font = ExtResource( 2 ) -custom_styles/hover = ExtResource( 3 ) -custom_styles/pressed = ExtResource( 5 ) -custom_styles/normal = ExtResource( 4 ) +custom_styles/hover = ExtResource( 5 ) +custom_styles/pressed = ExtResource( 4 ) +custom_styles/normal = ExtResource( 3 ) text = "QUIT" [connection signal="pressed" from="MenuButton/VBoxContainer/PlayButton" to="MenuButton" method="_on_PlayButton_pressed"] diff --git a/project.godot b/project.godot index 1a60482..b218456 100755 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="Gja" -run/main_scene="res://Scenes/menu.tscn" +run/main_scene="res://Scenes/Menu.tscn" config/icon="res://icon.png" [display]