refactor menu system yet again

1 files changed, 17 insertions, 42 deletions

diff --git a/client/menu/scene_transition.tscn b/client/menu/scene_transition.tscn
index ddfd6238..4ebf809e 100644
--- a/client/menu/scene_transition.tscn
+++ b/client/menu/scene_transition.tscn
@@ -1,48 +1,20 @@
-[gd_scene load_steps=7 format=3 uid="uid://bg2d78ycorcqk"]
+[gd_scene load_steps=5 format=3 uid="uid://bg2d78ycorcqk"]
 
 [ext_resource type="Script" path="res://menu/scene_transition.gd" id="1_fpbwj"]
-[ext_resource type="PackedScene" uid="uid://lxlgtjm8hw7v" path="res://menu/ingame_menu.tscn" id="2_aqaj2"]
 
 [sub_resource type="Animation" id="Animation_xgn2a"]
 length = 0.001
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:color")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Color(0, 0, 0, 1)]
-}
 
-[sub_resource type="Animation" id="Animation_tglmc"]
-resource_name = "fade_in"
+[sub_resource type="Animation" id="Animation_cq5i2"]
+resource_name = "fade"
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
-tracks/0/path = NodePath(".:color")
+tracks/0/path = NodePath("ColorRect:color")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.9),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
-}
-
-[sub_resource type="Animation" id="Animation_egop8"]
-resource_name = "fade_out"
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:color")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.9),
+"times": PackedFloat32Array(0, 1),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
 "values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
@@ -51,28 +23,31 @@ tracks/0/keys = {
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_pea72"]
 _data = {
 "RESET": SubResource("Animation_xgn2a"),
-"fade_in": SubResource("Animation_tglmc"),
-"fade_out": SubResource("Animation_egop8")
+"fade": SubResource("Animation_cq5i2")
 }
 
-[node name="SceneTransition" type="ColorRect"]
+[node name="SceneTransition" type="Control"]
+layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-mouse_filter = 2
-color = Color(0, 0, 0, 1)
 script = ExtResource("1_fpbwj")
 
-[node name="animation" type="AnimationPlayer" parent="."]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
 "": SubResource("AnimationLibrary_pea72")
 }
 speed_scale = 4.0
 
-[node name="IngameMenu" parent="." instance=ExtResource("2_aqaj2")]
+[node name="ColorRect" type="ColorRect" parent="."]
 visible = false
 layout_mode = 1
-offset_right = 2304.0
-offset_bottom = 1296.0
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+color = Color(0, 0, 0, 1)