From 5affc48dc537f9b687b18c8a88c1160b9d40c059 Mon Sep 17 00:00:00 2001 From: kziolkowski Date: Fri, 11 Jul 2025 04:12:42 +0200 Subject: [PATCH] Added scene transitions between fighting scene, credits, and start --- dialog/quest5_forest_end.dtl | 1 + scenes/Babushka_scene_credits.tscn | 18 +++++++++++++++++- scenes/Babushka_scene_forest_fight_1_2d.tscn | 4 ++-- scenes/Babushka_scene_outside_beets.tscn | 3 --- scenes/Babushka_scene_startMenu.tscn | 1 + 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dialog/quest5_forest_end.dtl b/dialog/quest5_forest_end.dtl index c0dde00..c111d19 100644 --- a/dialog/quest5_forest_end.dtl +++ b/dialog/quest5_forest_end.dtl @@ -2,4 +2,5 @@ join Chuga center Chuga: I believe you’ve seen enough for today. Chuga: And yes, you too. Thank you for playing! +do SceneTransition.ChangeSceneToFileThreaded("res://scenes/Babushka_scene_credits.tscn") [end_timeline] diff --git a/scenes/Babushka_scene_credits.tscn b/scenes/Babushka_scene_credits.tscn index 157b026..2c8a056 100644 --- a/scenes/Babushka_scene_credits.tscn +++ b/scenes/Babushka_scene_credits.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=8 format=3 uid="uid://c52tlxxc480dv"] +[gd_scene load_steps=9 format=3 uid="uid://cmpw8lhwnwuo6"] +[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_f5860"] [ext_resource type="Texture2D" uid="uid://c7atj6ohlmir3" path="res://art/ui/StartScreen/titlescreen.png" id="1_kesja"] [ext_resource type="Texture2D" uid="uid://du612t3xytly3" path="res://art/ui/StartScreen/babushkalog_white.png" id="2_f5860"] [ext_resource type="Texture2D" uid="uid://cfrhmcyhs2i53" path="res://art/ui/UI/WhiteWashBackground.png" id="3_dvwtm"] @@ -9,6 +10,8 @@ [ext_resource type="Texture2D" uid="uid://cwbv2i8ntq15d" path="res://art/logos/FS_Logo_2zeilig_rot.png" id="7_03xwf"] [node name="BabushkaSceneCredits" type="Node2D"] +script = ExtResource("1_f5860") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_startMenu.tscn") [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(1030, 483) @@ -427,3 +430,16 @@ texture = ExtResource("6_l0rmr") position = Vector2(1751, 917) scale = Vector2(0.496692, 0.496693) texture = ExtResource("7_03xwf") + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="Button" type="Button" parent="CanvasLayer"] +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -75.0 +offset_bottom = 71.0 +grow_horizontal = 0 +alignment = 2 + +[connection signal="pressed" from="CanvasLayer/Button" to="." method="LoadScene"] diff --git a/scenes/Babushka_scene_forest_fight_1_2d.tscn b/scenes/Babushka_scene_forest_fight_1_2d.tscn index 0f733a8..df7d2c8 100644 --- a/scenes/Babushka_scene_forest_fight_1_2d.tscn +++ b/scenes/Babushka_scene_forest_fight_1_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=70 format=3 uid="uid://dfyb4dckoltpw"] +[gd_scene load_steps=70 format=3 uid="uid://bb6r385qvyoba"] [ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_vl6d5"] [ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="3_jrqoq"] @@ -28,7 +28,7 @@ [ext_resource type="PackedScene" uid="uid://hk8ahyp6dgl6" path="res://prefabs/fight/fight_base_scene.tscn" id="27_55b52"] [ext_resource type="PackedScene" uid="uid://bp64p6y72j71w" path="res://prefabs/fight/fighters/enemy_blob_fighter.tscn" id="27_hfhye"] [ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="29_3jjxs"] -[ext_resource type="PackedScene" uid="uid://ddpl8cbck7e6s" path="res://prefabs/characters/Chugar.tscn" id="29_26tkn"] +[ext_resource type="PackedScene" path="res://prefabs/characters/Chugar.tscn" id="29_26tkn"] [ext_resource type="PackedScene" uid="uid://cr66tpdr5rma5" path="res://prefabs/fight/fighters/enemy_mavkha_fighter.tscn" id="29_hfhye"] [ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="30_l10vl"] [ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="31_c2gvt"] diff --git a/scenes/Babushka_scene_outside_beets.tscn b/scenes/Babushka_scene_outside_beets.tscn index 4304f9f..c5acf97 100644 --- a/scenes/Babushka_scene_outside_beets.tscn +++ b/scenes/Babushka_scene_outside_beets.tscn @@ -1906,9 +1906,6 @@ offset_top = 0.228533 offset_right = -456.339 offset_bottom = 30.2285 -[node name="Control" parent="CanvasLayer" index="3"] -visible = false - [node name="Audio" type="Node" parent="."] [node name="Background Music Ramp up" type="AudioStreamPlayer2D" parent="Audio"] diff --git a/scenes/Babushka_scene_startMenu.tscn b/scenes/Babushka_scene_startMenu.tscn index 6ab29a3..f4ea948 100644 --- a/scenes/Babushka_scene_startMenu.tscn +++ b/scenes/Babushka_scene_startMenu.tscn @@ -6,6 +6,7 @@ [node name="BabushkaSceneStartMenu" type="Node2D"] script = ExtResource("1_fj2fh") +_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_disclaimer.tscn") [node name="CanvasLayer" type="CanvasLayer" parent="."]