diff --git a/planets/planetOne/caveEntranceOne.gd b/planets/planetOne/caveEntranceOne.gd index 6d0a932..885569e 100644 --- a/planets/planetOne/caveEntranceOne.gd +++ b/planets/planetOne/caveEntranceOne.gd @@ -2,5 +2,9 @@ extends Area2D var levelTwo = preload("res://levels/levelTwo/levelTwo.tscn") +signal playerExit + func _on_body_entered(body: Node2D) -> void: + emit_signal("playerExit") + await get_tree().create_timer(2).timeout get_tree().change_scene_to_packed(levelTwo) diff --git a/planets/planetOne/planetOne.tscn b/planets/planetOne/planetOne.tscn index db38039..5d08d3d 100644 --- a/planets/planetOne/planetOne.tscn +++ b/planets/planetOne/planetOne.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://dh0lvt4eb1x5s"] +[gd_scene load_steps=25 format=3 uid="uid://dh0lvt4eb1x5s"] [ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_pfjy3"] [ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_tvkms"] @@ -16,6 +16,7 @@ [ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_lept3"] [ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_4smcn"] [ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="16_r40ym"] +[ext_resource type="Script" uid="uid://jeddvfkorpxu" path="res://levels/levelOne/animation_player.gd" id="17_njh3w"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_3xb1h"] size = Vector2(40, 36.5) @@ -60,6 +61,94 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_dp0ko"] +[sub_resource type="Animation" id="Animation_h31ej"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect: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)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0, 0, 0, 1)] +} + +[sub_resource type="Animation" id="Animation_a6hc6"] +resource_name = "fadeIn" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_e5775"] +resource_name = "fadeOut" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_h31ej"] +_data = { +&"RESET": SubResource("Animation_h31ej"), +&"fadeIn": SubResource("Animation_a6hc6"), +&"fadeOut": SubResource("Animation_e5775") +} + [node name="planetScene" type="Node2D"] [node name="TextureRect" type="TextureRect" parent="."] @@ -109,4 +198,24 @@ autoplay = "default" [node name="CollisionShape2D" type="CollisionShape2D" parent="playerModel"] shape = SubResource("RectangleShape2D_dp0ko") +[node name="fadeOut" type="CanvasLayer" parent="."] + +[node name="AnimationPlayer" type="AnimationPlayer" parent="fadeOut"] +physics_interpolation_mode = 1 +libraries = { +&"": SubResource("AnimationLibrary_h31ej") +} +script = ExtResource("17_njh3w") + +[node name="ColorRect" type="ColorRect" parent="fadeOut"] +modulate = Color(0, 0, 0, 1) +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 1) +metadata/_edit_use_anchors_ = true + [connection signal="body_entered" from="planetSprite/caveEntrance" to="planetSprite/caveEntrance" method="_on_body_entered"] +[connection signal="playerExit" from="planetSprite/caveEntrance" to="fadeOut/AnimationPlayer" method="_on_exit_zone_player_exit"] diff --git a/planets/planetThree/caveEntranceThree.gd b/planets/planetThree/caveEntranceThree.gd index 2aa6481..65dd828 100644 --- a/planets/planetThree/caveEntranceThree.gd +++ b/planets/planetThree/caveEntranceThree.gd @@ -2,6 +2,10 @@ extends Area2D var levelFinal = preload("res://levels/levelFinal/levelFinal.tscn") +signal playerExit + func _on_body_entered(body: Node2D) -> void: print ("Entering levelFINAL") + emit_signal("playerExit") + await get_tree().create_timer(2).timeout get_tree().change_scene_to_packed(levelFinal) diff --git a/planets/planetThree/planetThree.tscn b/planets/planetThree/planetThree.tscn index 68d35e9..293b0d4 100644 --- a/planets/planetThree/planetThree.tscn +++ b/planets/planetThree/planetThree.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://bw0pg86y720j"] +[gd_scene load_steps=33 format=3 uid="uid://bw0pg86y720j"] [ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_baac1"] [ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_y1spn"] @@ -23,6 +23,7 @@ [ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_s7fta"] [ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_hrtuk"] [ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="16_2huu8"] +[ext_resource type="Script" uid="uid://jeddvfkorpxu" path="res://levels/levelOne/animation_player.gd" id="24_ho6ck"] [sub_resource type="SpriteFrames" id="SpriteFrames_hrtuk"] animations = [{ @@ -96,6 +97,94 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_dp0ko"] +[sub_resource type="Animation" id="Animation_h31ej"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect: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)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0, 0, 0, 1)] +} + +[sub_resource type="Animation" id="Animation_a6hc6"] +resource_name = "fadeIn" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_e5775"] +resource_name = "fadeOut" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_h31ej"] +_data = { +&"RESET": SubResource("Animation_h31ej"), +&"fadeIn": SubResource("Animation_a6hc6"), +&"fadeOut": SubResource("Animation_e5775") +} + [node name="planetScene" type="Node2D"] [node name="background" type="TextureRect" parent="."] @@ -147,4 +236,24 @@ autoplay = "default" [node name="CollisionShape2D" type="CollisionShape2D" parent="playerModel"] shape = SubResource("RectangleShape2D_dp0ko") +[node name="fadeOut" type="CanvasLayer" parent="."] + +[node name="AnimationPlayer" type="AnimationPlayer" parent="fadeOut"] +physics_interpolation_mode = 1 +libraries = { +&"": SubResource("AnimationLibrary_h31ej") +} +script = ExtResource("24_ho6ck") + +[node name="ColorRect" type="ColorRect" parent="fadeOut"] +modulate = Color(0, 0, 0, 1) +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 1) +metadata/_edit_use_anchors_ = true + [connection signal="body_entered" from="planetSprite/caveEntrance" to="planetSprite/caveEntrance" method="_on_body_entered"] +[connection signal="playerExit" from="planetSprite/caveEntrance" to="fadeOut/AnimationPlayer" method="_on_exit_zone_player_exit"] diff --git a/planets/planetTwo/caveEntranceTwo.gd b/planets/planetTwo/caveEntranceTwo.gd index c935565..c3218e0 100644 --- a/planets/planetTwo/caveEntranceTwo.gd +++ b/planets/planetTwo/caveEntranceTwo.gd @@ -2,5 +2,9 @@ extends Area2D var levelThree = preload("res://levels/levelThree/levelThree.tscn") +signal playerExit + func _on_body_entered(body: Node2D) -> void: + emit_signal("playerExit") + await get_tree().create_timer(2).timeout get_tree().change_scene_to_packed(levelThree) diff --git a/planets/planetTwo/planetTwo.tscn b/planets/planetTwo/planetTwo.tscn index 982f8c1..ca1c6ec 100644 --- a/planets/planetTwo/planetTwo.tscn +++ b/planets/planetTwo/planetTwo.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://djwdtavyh4ts1"] +[gd_scene load_steps=25 format=3 uid="uid://djwdtavyh4ts1"] [ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_qoowv"] [ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_kt3hf"] @@ -16,6 +16,7 @@ [ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_byiy2"] [ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_1oi7f"] [ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="16_7tw6i"] +[ext_resource type="Script" uid="uid://jeddvfkorpxu" path="res://levels/levelOne/animation_player.gd" id="17_i2pxn"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_3xb1h"] size = Vector2(40, 36.5) @@ -60,6 +61,94 @@ animations = [{ [sub_resource type="RectangleShape2D" id="RectangleShape2D_dp0ko"] +[sub_resource type="Animation" id="Animation_h31ej"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect: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)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0, 0, 0, 1)] +} + +[sub_resource type="Animation" id="Animation_a6hc6"] +resource_name = "fadeIn" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} + +[sub_resource type="Animation" id="Animation_e5775"] +resource_name = "fadeOut" +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ColorRect:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("ColorRect:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_h31ej"] +_data = { +&"RESET": SubResource("Animation_h31ej"), +&"fadeIn": SubResource("Animation_a6hc6"), +&"fadeOut": SubResource("Animation_e5775") +} + [node name="planetScene" type="Node2D"] [node name="background" type="TextureRect" parent="."] @@ -111,4 +200,23 @@ autoplay = "default" [node name="CollisionShape2D" type="CollisionShape2D" parent="playerModel"] shape = SubResource("RectangleShape2D_dp0ko") +[node name="fadeOut" type="CanvasLayer" parent="."] + +[node name="AnimationPlayer" type="AnimationPlayer" parent="fadeOut"] +physics_interpolation_mode = 1 +libraries = { +&"": SubResource("AnimationLibrary_h31ej") +} +script = ExtResource("17_i2pxn") + +[node name="ColorRect" type="ColorRect" parent="fadeOut"] +modulate = Color(0, 0, 0, 1) +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 1) +metadata/_edit_use_anchors_ = true + [connection signal="body_entered" from="planetSprite/caveEntrance" to="planetSprite/caveEntrance" method="_on_body_entered"]