diff --git a/Dialogue/Timelines/Level2/computer_lab_2.dtl b/Dialogue/Timelines/Level2/computer_lab_2.dtl new file mode 100644 index 00000000..44e3ad88 --- /dev/null +++ b/Dialogue/Timelines/Level2/computer_lab_2.dtl @@ -0,0 +1,2 @@ +[style name="Terminal_Style"] +computer: Opening secret room... diff --git a/Dialogue/Timelines/Level2/computer_lab_2.dtl.uid b/Dialogue/Timelines/Level2/computer_lab_2.dtl.uid new file mode 100644 index 00000000..f1c53fbc --- /dev/null +++ b/Dialogue/Timelines/Level2/computer_lab_2.dtl.uid @@ -0,0 +1 @@ +uid://b4k22xk2fbmco diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 4938fb17..9d917a10 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=98 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=102 format=4 uid="uid://6a6tjohypmmb"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"] @@ -37,9 +37,11 @@ [ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="31_nb1db"] [ext_resource type="PackedScene" uid="uid://b7gkxlll3b1eg" path="res://Scenes/Activable/FloorEmitter.tscn" id="33_6h3t3"] [ext_resource type="Texture2D" uid="uid://r2bdhalt8sih" path="res://Sprites/Items/ofudagun_test.png" id="33_v8wj6"] +[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="35_im0gw"] [ext_resource type="Resource" uid="uid://cmra7n6so1x4u" path="res://Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres" id="35_imrxd"] +[ext_resource type="Resource" uid="uid://qbo6avc7x64b" path="res://Resources/Enemies/Fairy_Guard.tres" id="36_6jwww"] [ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="37_5j8ks"] -[ext_resource type="PackedScene" uid="uid://dfat0erkvb513" path="res://Scenes/Actors/Fairy_New.tscn" id="37_sb7g3"] +[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="37_il2wr"] [ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="38_sb7g3"] [ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="40_sb7g3"] [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="42_joghw"] @@ -337,6 +339,20 @@ TimelineName = &"computer_lab_1" WaitForCompletion = true metadata/_custom_type_script = "uid://ddv26x2qilprb" +[sub_resource type="Resource" id="Resource_7f2nv"] +resource_local_to_scene = true +script = ExtResource("44_1gtgk") +TimelineName = &"computer_lab_2" +WaitForCompletion = true +metadata/_custom_type_script = "uid://ddv26x2qilprb" + +[sub_resource type="Resource" id="Resource_im0gw"] +script = ExtResource("14_s23f3") +ActivationType = 0 +Targets = Array[NodePath]([NodePath("../RogueliteEnemySpawner17")]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bwox5lmgiijcs" + [node name="GameScene" type="Node2D" node_paths=PackedStringArray("NavigationTilemap")] script = ExtResource("1_t2k72") MapResource = ExtResource("2_5t0ab") @@ -468,7 +484,7 @@ curve = SubResource("Curve2D_owyq0") position = Vector2(-9, 516) [node name="AlarmBox2" parent="Tilemaps/Actors" instance=ExtResource("23_uaqq6")] -position = Vector2(73, 247) +position = Vector2(74, 243) [node name="Teleporter2" parent="Tilemaps/Actors" instance=ExtResource("6_e12id")] position = Vector2(135, 488) @@ -563,14 +579,34 @@ position = Vector2(-209, 575) Script = ExtResource("35_imrxd") InvertSignal = true -[node name="Fairy" parent="Tilemaps/Actors" instance=ExtResource("37_sb7g3")] -position = Vector2(83, 342) +[node name="RogueliteEnemySpawner13" type="Marker2D" parent="Tilemaps/Actors"] +position = Vector2(146, 542) +script = ExtResource("35_im0gw") +Enemy = ExtResource("36_6jwww") +AutoSpawn = true -[node name="Fairy2" parent="Tilemaps/Actors" instance=ExtResource("37_sb7g3")] -position = Vector2(-103, 505) +[node name="RogueliteEnemySpawner17" type="Marker2D" parent="Tilemaps/Actors"] +position = Vector2(100, 537) +script = ExtResource("35_im0gw") +Enemy = ExtResource("36_6jwww") -[node name="Fairy5" parent="Tilemaps/Actors" instance=ExtResource("37_sb7g3")] -position = Vector2(287, 515) +[node name="RogueliteEnemySpawner14" type="Marker2D" parent="Tilemaps/Actors"] +position = Vector2(92.6661, 332.966) +script = ExtResource("35_im0gw") +Enemy = ExtResource("37_il2wr") +AutoSpawn = true + +[node name="RogueliteEnemySpawner16" type="Marker2D" parent="Tilemaps/Actors"] +position = Vector2(-91.6593, 291.221) +script = ExtResource("35_im0gw") +Enemy = ExtResource("37_il2wr") +AutoSpawn = true + +[node name="RogueliteEnemySpawner15" type="Marker2D" parent="Tilemaps/Actors"] +position = Vector2(284, 520) +script = ExtResource("35_im0gw") +Enemy = ExtResource("37_il2wr") +AutoSpawn = true [node name="Camera2" parent="Tilemaps/Actors" instance=ExtResource("17_s23f3")] position = Vector2(-56, 251) @@ -698,6 +734,37 @@ Target = NodePath("../HorizontalForceField3") position = Vector2(-664, 1002) Target = NodePath("../VerticalDoor4") +[node name="ControlPad9" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("16_s23f3")] +position = Vector2(-248, 257) +Target = NodePath("../HorizontalDoor2") + +[node name="ControlPad11" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("16_s23f3")] +position = Vector2(-246, 225) +Target = NodePath("../HorizontalDoor2") + +[node name="Computer2" parent="Tilemaps/Actors/ControlPad11" node_paths=PackedStringArray("Target", "Targets") instance=ExtResource("45_f2fbs")] +position = Vector2(54, -44) +Direction = 0 +Target = NodePath("../../Computer6/Script2") +Targets = [NodePath("Script2")] +metadata/_edit_group_ = true + +[node name="Script2" type="Node2D" parent="Tilemaps/Actors/ControlPad11/Computer2"] +position = Vector2(120, 25) +script = ExtResource("46_dotto") +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_7f2nv")]) + +[node name="ControlPad10" parent="Tilemaps/Actors" instance=ExtResource("16_s23f3")] +position = Vector2(-138, 257) + +[node name="ControlPad12" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("16_s23f3")] +position = Vector2(-134, 224) +Target = NodePath("../HorizontalDoor3") + +[node name="ScriptableAreaTrigger" parent="Tilemaps/Actors" instance=ExtResource("43_q1ysg")] +position = Vector2(-47, 407) +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_im0gw")]) + [node name="ReferenceRect" type="ReferenceRect" parent="."] visible = false offset_left = -38.0 diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 2c8c3c00..08d78503 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=173 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=172 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ksslq"] @@ -51,7 +51,6 @@ [ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="35_rblsn"] [ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="36_f8fh1"] [ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="36_rd6f6"] -[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="36_w8skm"] [ext_resource type="PackedScene" uid="uid://dsbk2l40er2da" path="res://Scenes/Props/Box_Blue.tscn" id="37_gtga7"] [ext_resource type="PackedScene" uid="uid://c8lgk4wnyi1e6" path="res://Scenes/Actors/HealthStation.tscn" id="38_kuhg5"] [ext_resource type="PackedScene" uid="uid://cl4r3t4c1klv7" path="res://Scenes/Interactable/Switch_Box.tscn" id="38_qnbhd"] @@ -304,7 +303,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_pt47r"] +[sub_resource type="Resource" id="Resource_dfo5i"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -695,7 +694,7 @@ position = Vector2(-1832, -99) [node name="Chest2" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("25_4b2ed")] position = Vector2(-679, -408) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")]) +LootTable = [ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")] [node name="Valve" parent="Parallax2D/Factory Tilemaps/Debug Room" node_paths=PackedStringArray("Target") instance=ExtResource("48_8usll")] position = Vector2(-666, -545) @@ -1013,7 +1012,7 @@ position = Vector2(-1488, -544) [node name="Chest" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-920, -424) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")]) +LootTable = [ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")] [node name="RedKeycard_Switch_2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("17_e3v0b")] position = Vector2(-1095, 132) @@ -1263,7 +1262,7 @@ Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_068l7"), SubResou [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_pt47r")]) +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_dfo5i")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -1382,7 +1381,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = Array[ExtResource("36_w8skm")]([ExtResource("84_ma1ta")]) +Requirements = [ExtResource("84_ma1ta")] [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -1442,35 +1441,35 @@ position = Vector2(-1624, -813) [node name="Chest3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-376, 54) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Chest5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1048, -139) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")] [node name="Chest6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-2104, -362) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")] [node name="Chest4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-823, 67) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Chest7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1417, 326) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Chest10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1515, 408) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Chest8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1544, 552) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Chest9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")] position = Vector2(-1384, 231) -LootTable = Array[ExtResource("36_w8skm")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]) +LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")] [node name="Ammo13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-392, 52) diff --git a/project.godot b/project.godot index 93e25332..829c64ca 100644 --- a/project.godot +++ b/project.godot @@ -76,6 +76,7 @@ directories/dtl_directory={ "computer_goon_cave": "res://Dialogue/Timelines/computer_goon_cave.dtl", "computer_keycard_room": "res://Dialogue/Timelines/computer_keycard_room.dtl", "computer_lab_1": "res://Dialogue/Timelines/Level2/computer_lab_1.dtl", +"computer_lab_2": "res://Dialogue/Timelines/Level2/computer_lab_2.dtl", "intro_story": "res://Dialogue/Timelines/intro_story.dtl", "laser_tutorial": "res://Dialogue/Timelines/laser_tutorial.dtl", "rumia_defeat": "res://Dialogue/Timelines/rumia_defeat.dtl",