diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index 82a327c1..755ebcd3 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=29 format=3 uid="uid://d1lc8lhq1b05p"] +[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=31 format=3 uid="uid://d1lc8lhq1b05p"] [ext_resource type="Script" uid="uid://durmwwyw3dnm6" path="res://Scripts/Resources/DebugMenu/DebugMapSelectData.cs" id="1_6kwth"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_ov731"] @@ -19,7 +19,7 @@ _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) +StartingEquipment = [] [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") @@ -31,7 +31,7 @@ StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) +StartingEquipment = [] [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") @@ -43,7 +43,7 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) +StartingEquipment = [] [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") @@ -73,7 +73,7 @@ _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = Array[ExtResource("2_bkci5")]([]) +StartingEquipment = [] [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") @@ -125,6 +125,20 @@ Path = "res://Scenes/Maps/PlayerFSMTest.tscn" _name = "FSM Test" metadata/_custom_type_script = "uid://dnthdjrx78u6m" +[sub_resource type="Resource" id="Resource_7sue8"] +script = ExtResource("1_ov731") +EggIndex = 255 +StartingEquipment = [] +metadata/_custom_type_script = "uid://mja0rk7n2kln" + +[sub_resource type="Resource" id="Resource_ognca"] +script = ExtResource("2_tnajf") +Enabled = true +Path = "res://Scenes/Maps/Tutorial.tscn" +_name = "Tutorial (End)" +StartData = SubResource("Resource_7sue8") +metadata/_custom_type_script = "uid://dnthdjrx78u6m" + [resource] script = ExtResource("1_6kwth") -Maps = Array[Object]([SubResource("Resource_qnbi6"), SubResource("Resource_0k62o"), SubResource("Resource_edoov"), SubResource("Resource_47bot"), SubResource("Resource_mgdm6"), SubResource("Resource_v2as6"), SubResource("Resource_pein5"), SubResource("Resource_6wrc7"), SubResource("Resource_x3w7w"), SubResource("Resource_ajht5"), SubResource("Resource_7vmdn"), SubResource("Resource_6ijnv"), SubResource("Resource_bkci5")]) +Maps = Array[Object]([SubResource("Resource_qnbi6"), SubResource("Resource_0k62o"), SubResource("Resource_edoov"), SubResource("Resource_47bot"), SubResource("Resource_mgdm6"), SubResource("Resource_v2as6"), SubResource("Resource_pein5"), SubResource("Resource_6wrc7"), SubResource("Resource_x3w7w"), SubResource("Resource_ajht5"), SubResource("Resource_7vmdn"), SubResource("Resource_6ijnv"), SubResource("Resource_bkci5"), SubResource("Resource_ognca")]) diff --git a/Scenes/Maps/Tutorial.tscn b/Scenes/Maps/Tutorial.tscn index 613fb50b..e96f8890 100644 --- a/Scenes/Maps/Tutorial.tscn +++ b/Scenes/Maps/Tutorial.tscn @@ -112,7 +112,8 @@ process_mode = 3 script = ExtResource("1_qxyfr") PlayerTemplate = ExtResource("2_ajkcn") SpawnMarkers = Dictionary[int, NodePath]({ -0: NodePath("PlayerStartPosition") +0: NodePath("PlayerStartPosition"), +255: NodePath("DebugEndStart") }) MapStartData = SubResource("Resource_6wo78") @@ -296,6 +297,9 @@ script = ExtResource("10_kpjh7") [node name="PlayerStartPosition" type="Marker2D" parent="."] position = Vector2(128, 384) +[node name="DebugEndStart" type="Marker2D" parent="."] +position = Vector2(653, -2) + [node name="AlarmManager" type="Node2D" parent="."] process_mode = 1 script = ExtResource("11_htvvb") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 8f9bb30a..9c035320 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -437,6 +437,12 @@ position = Vector2(-625, 5) [node name="BigTank2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("45_5qg27")] position = Vector2(-625, 40) +[node name="BigTank6" parent="Factory Tilemaps/LevelProps" instance=ExtResource("45_5qg27")] +position = Vector2(-1712, -138) + +[node name="BigTank5" parent="Factory Tilemaps/LevelProps" instance=ExtResource("45_5qg27")] +position = Vector2(-1712, -113) + [node name="BigTank3" parent="Factory Tilemaps/LevelProps" instance=ExtResource("45_5qg27")] position = Vector2(-945, -218) @@ -483,8 +489,9 @@ IsEnabled = true Target = NodePath("../DebugTeleporter") [node name="DebugTeleporter" parent="Factory Tilemaps/LevelProps" instance=ExtResource("30_8fdby")] -position = Vector2(-1518, -611) +position = Vector2(-861, 206) Invisible = true +metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] Events = Array[Object]([SubResource("Resource_usuub")]) @@ -794,6 +801,9 @@ position = Vector2(-692, 56) [node name="FairyGuard2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] position = Vector2(-796, 100) +[node name="FairyGuard7" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] +position = Vector2(-1014.21, 203.243) + [node name="Fairy" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] position = Vector2(-682, -8) @@ -824,9 +834,6 @@ position = Vector2(-1128, 170) [node name="Fairy6" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] position = Vector2(-922, 105) -[node name="FairyGuard7" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] -position = Vector2(-1010, 203) - [node name="FairyGuard9" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_cfpaq")] position = Vector2(-866, -92)