Improve transitions

1 files changed, 13 insertions, 9 deletions

diff --git a/top.tscn b/top.tscn
index b47a0aa..92486cc 100644
--- a/top.tscn
+++ b/top.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=7 format=3 uid="uid://cey3jxnpmommt"]
+[gd_scene load_steps=8 format=3 uid="uid://cey3jxnpmommt"]
 
 [ext_resource type="Script" uid="uid://dxbspy72bg0db" path="res://top.gd" id="1_on2c2"]
 [ext_resource type="PackedScene" uid="uid://cjdhfl70fgt6m" path="res://room_main_menu.tscn" id="2_58ij3"]
+[ext_resource type="PackedScene" uid="uid://cseqghymhiyqo" path="res://map.tscn" id="3_58ij3"]
 
 [sub_resource type="Animation" id="Animation_58ij3"]
 length = 0.001
@@ -18,8 +19,8 @@ tracks/0/keys = {
 "values": [Color(0, 0, 0, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_2exal"]
-resource_name = "room_trans_start"
+[sub_resource type="Animation" id="Animation_edsjh"]
+resource_name = "room_trans_end"
 length = 2.0
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -31,7 +32,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 2),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
+"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
 }
 tracks/1/type = "method"
 tracks/1/imported = false
@@ -44,12 +45,12 @@ tracks/1/keys = {
 "transitions": PackedFloat32Array(1),
 "values": [{
 "args": [],
-"method": &"_transition_start"
+"method": &"_transition_end"
 }]
 }
 
-[sub_resource type="Animation" id="Animation_edsjh"]
-resource_name = "room_trans_end"
+[sub_resource type="Animation" id="Animation_2exal"]
+resource_name = "room_trans_start"
 length = 2.0
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -61,7 +62,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 2),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
+"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
 }
 tracks/1/type = "method"
 tracks/1/imported = false
@@ -74,7 +75,7 @@ tracks/1/keys = {
 "transitions": PackedFloat32Array(1),
 "values": [{
 "args": [],
-"method": &"_transition_end"
+"method": &"_transition_start"
 }]
 }
 
@@ -95,6 +96,7 @@ initial_room = ExtResource("2_58ij3")
 [node name="ColorRect" type="ColorRect" parent="TransitionCanvas"]
 offset_right = 192.0
 offset_bottom = 108.0
+mouse_filter = 2
 color = Color(0, 0, 0, 0)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="TransitionCanvas"]
@@ -103,3 +105,5 @@ libraries = {
 &"": SubResource("AnimationLibrary_2exal")
 }
 speed_scale = 3.0
+
+[node name="Map" parent="." instance=ExtResource("3_58ij3")]