From f7037fa0433faf795a3e0f9db4b97c3f3bf90c03 Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 12 Mar 2025 15:47:48 +0100 Subject: [PATCH] Fixed tutorial dialogues --- Scenes/Maps/Tutorial.tscn | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/Scenes/Maps/Tutorial.tscn b/Scenes/Maps/Tutorial.tscn index 1d4cce1b..917cf512 100644 --- a/Scenes/Maps/Tutorial.tscn +++ b/Scenes/Maps/Tutorial.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=52 format=4 uid="uid://bpnahwxmjgb6t"] +[gd_scene load_steps=49 format=4 uid="uid://bpnahwxmjgb6t"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"] -[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_0xhda"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2m462"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_bnfdx"] @@ -19,7 +18,6 @@ [ext_resource type="PackedScene" uid="uid://c27co22bjym3c" path="res://Scenes/Actors/Camera.tscn" id="12_chhxg"] [ext_resource type="PackedScene" uid="uid://d1h48wgasakk4" path="res://Scenes/Interactable/alarm_box.tscn" id="13_cawq2"] [ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="13_covcf"] -[ext_resource type="Script" uid="uid://donxnd50p7dm8" path="res://Scripts/Resources/Events/AlarmDisableEvent.cs" id="14_wc2f3"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="15_l8ewr"] [ext_resource type="PackedScene" uid="uid://ca6befbx0nurt" path="res://Scenes/Interactable/ScriptableEnabledAlarmTrigger.tscn" id="15_qub1o"] [ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="16_wk6n2"] @@ -39,11 +37,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_g48r8") EggIndex = 0 -StartingEquipment = Array[ExtResource("3_0xhda")]([]) - -[sub_resource type="Resource" id="Resource_hppa0"] -script = ExtResource("14_wc2f3") -WaitForCompletion = true +StartingEquipment = [] [sub_resource type="Resource" id="Resource_3vy3u"] script = ExtResource("15_l8ewr") @@ -59,12 +53,12 @@ WaitForCompletion = true [sub_resource type="Resource" id="Resource_ierdo"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_intro" WaitForCompletion = true [sub_resource type="Resource" id="Resource_8yymf"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_switch" WaitForCompletion = true [sub_resource type="Resource" id="Resource_dbad5"] @@ -75,7 +69,7 @@ WaitForCompletion = true [sub_resource type="Resource" id="Resource_f3qhg"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_gun" WaitForCompletion = true [sub_resource type="Resource" id="Resource_ulu4a"] @@ -84,22 +78,22 @@ WaitForCompletion = true [sub_resource type="Resource" id="Resource_35vjh"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_barrels" WaitForCompletion = true [sub_resource type="Resource" id="Resource_p02qj"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_teleporter_1" WaitForCompletion = true [sub_resource type="Resource" id="Resource_t62sp"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_teleporter_2" WaitForCompletion = true [sub_resource type="Resource" id="Resource_m71ef"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_repeater" WaitForCompletion = true [sub_resource type="Resource" id="Resource_54a43"] @@ -110,7 +104,7 @@ WaitForCompletion = true [sub_resource type="Resource" id="Resource_8phm4"] script = ExtResource("22_nyb1x") -TimelineName = &"timeline" +TimelineName = &"tutorial_cameras" WaitForCompletion = true [sub_resource type="Resource" id="Resource_7uxja"] @@ -187,7 +181,6 @@ position = Vector2(511, -115) [node name="AlarmBox" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("13_cawq2")] position = Vector2(440, -107) -Events = Array[ExtResource("13_covcf")]([SubResource("Resource_hppa0")]) [node name="VerticalDoor" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("16_wk6n2")] position = Vector2(612, -56) @@ -238,7 +231,7 @@ Events = Array[ExtResource("13_covcf")]([SubResource("Resource_t62sp")]) position = Vector2(634, -40) Events = Array[ExtResource("13_covcf")]([SubResource("Resource_m71ef")]) -[node name="ScriptableAreaTrigger" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] +[node name="Cameras" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(433, -41) Events = Array[ExtResource("13_covcf")]([SubResource("Resource_54a43"), SubResource("Resource_8phm4"), SubResource("Resource_7uxja")])