diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 76dc2df0..147dc1fd 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -20,7 +20,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_s1vkf") EggIndex = 0 -StartingEquipment = [ExtResource("3_mqt4u")] +StartingEquipment = Array[ExtResource("3_6w05j")]([ExtResource("3_mqt4u")]) [node name="GameScene" type="Node2D"] script = ExtResource("1_t2k72") @@ -47,7 +47,7 @@ metadata/_edit_lock_ = true [node name="Props" type="TileMapLayer" parent="Tilemaps"] y_sort_enabled = true -tile_map_data = PackedByteArray("AAARABEAAQAAAAAAAgASABEAAQAAAAAAAgAVABQAAQAAAAAAAgAVABEAAQAAAAAADAAVABIAAQAAAAAADAAUABEAAQAAAAAADQAKABAAAAAGAAAAAAALABAAAAAHAAAAAAAHABAAAAAGAAAAAAAIABAAAAAHAAAAAAADABAAAAAGAAAAAAAEABAAAAAHAAAAAAAFABAAAQAAAAAAAgAGABAAAQAAAAAAAgAJABAAAQAAAAAAAgADABUAAQAAAAAAAQADABYAAQAAAAAAAQAEABcAAQAAAAAADgADABcAAQAAAAAAAQATABEAAQAAAAAADwAVABMAAQAAAAAADwADABgAAQAAAAAADgAEABgAAQAAAAAADgALABgAAQAAAAAACQAKABgAAQAAAAAADwALABcAAQAAAAAAAQAJABgAAQAAAAAAEAAIABgAAQAAAAAAEAADABMAAQAAAAAAEAADABQAAQAAAAAAEAAKAB4AAQAAAAAAEAALAB4AAQAAAAAAEAACAB4AAQAAAAAAEAADAB4AAQAAAAAAAQAJAB4AAQAAAAAAAQALAB8AAQAAAAAAAQAJACMAAQAAAAAAAgAKACMAAQAAAAAAAgALACMAAQAAAAAACQAIACMAAQAAAAAADAAEACMAAQAAAAAADAAHACMAAQAAAAAAEAADACMAAQAAAAAADQAFACMAAQAAAAAADgAGACMAAQAAAAAAEAA=") +tile_map_data = PackedByteArray("AAARABEAAQAAAAAAAgASABEAAQAAAAAAAgAVABQAAQAAAAAAAgAVABEAAQAAAAAADAAVABIAAQAAAAAADAAUABEAAQAAAAAADQAKABAAAAAGAAAAAAALABAAAAAHAAAAAAAHABAAAAAGAAAAAAAIABAAAAAHAAAAAAADABAAAAAGAAAAAAAEABAAAAAHAAAAAAAFABAAAQAAAAAAAgAGABAAAQAAAAAAAgADABUAAQAAAAAAAQADABYAAQAAAAAAAQAEABcAAQAAAAAADgADABcAAQAAAAAAAQATABEAAQAAAAAADwAVABMAAQAAAAAADwADABgAAQAAAAAADgAEABgAAQAAAAAADgALABgAAQAAAAAACQAKABgAAQAAAAAADwALABcAAQAAAAAAAQAJABgAAQAAAAAAEAAIABgAAQAAAAAAEAADABMAAQAAAAAAEAADABQAAQAAAAAAEAAKAB4AAQAAAAAAEAALAB4AAQAAAAAAEAACAB4AAQAAAAAAEAADAB4AAQAAAAAAAQAJAB4AAQAAAAAAAQALAB8AAQAAAAAAAQAJACMAAQAAAAAAAgAKACMAAQAAAAAAAgALACMAAQAAAAAACQAIACMAAQAAAAAADAAEACMAAQAAAAAADAAHACMAAQAAAAAAEAADACMAAQAAAAAADQAFACMAAQAAAAAADgAGACMAAQAAAAAAEAAJABAAAQAAAAAAEQA=") tile_set = ExtResource("5_06rc0") metadata/_edit_lock_ = true diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn index 22fa716c..b4a2a222 100644 --- a/Scenes/Maps/RebelBase.tscn +++ b/Scenes/Maps/RebelBase.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=4 uid="uid://bx31ou6tw3kd1"] +[gd_scene load_steps=32 format=4 uid="uid://bx31ou6tw3kd1"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_jpse7"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_8erab"] @@ -18,6 +18,7 @@ [ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="9_700kw"] [ext_resource type="Script" uid="uid://cjy38nsh83ug1" path="res://Scripts/Activables/NPC.cs" id="9_cr26l"] [ext_resource type="Texture2D" uid="uid://bbdrws471xslc" path="res://Sprites/Actors/Rumia-world.png" id="10_6rpbc"] +[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="13_qgmsa"] [ext_resource type="PackedScene" uid="uid://bjb1xv0ny1qim" path="res://Scenes/Props/Chair.tscn" id="14_2ugqu"] [ext_resource type="PackedScene" uid="uid://cyy5i38sf7fid" path="res://Scenes/Props/Locker.tscn" id="14_6rpbc"] [ext_resource type="PackedScene" uid="uid://doqmmuuuprl3s" path="res://Scenes/Interactable/Computer.tscn" id="15_ce68b"] @@ -37,6 +38,14 @@ TimelineName = &"colonel1" WaitForCompletion = true metadata/_custom_type_script = "uid://ddv26x2qilprb" +[sub_resource type="Resource" id="Resource_8anae"] +resource_local_to_scene = true +script = ExtResource("13_qgmsa") +ActivationType = 1 +Targets = Array[NodePath]([NodePath("../Teleporter")]) +WaitForCompletion = true +metadata/_custom_type_script = "uid://bwox5lmgiijcs" + [sub_resource type="AtlasTexture" id="AtlasTexture_cr26l"] atlas = ExtResource("10_6rpbc") region = Rect2(0, 0, 8, 16) @@ -68,7 +77,7 @@ tile_set = ExtResource("2_m7mag") metadata/_edit_lock_ = true [node name="Props" type="TileMapLayer" parent="Tilemaps"] -tile_map_data = PackedByteArray("AAAEACAAAAAGAAAAAAAFACAAAAAHAAAAAAAGACAAAAAGAAAAAAAHACAAAAAHAAAAAAAAACAAAAAGAAAAAAABACAAAAAHAAAAAAD+/yAAAAAGAAAAAAD//yAAAAAHAAAAAAD+/yMAAAAIAAAAAAD+/yQAAAAIAAEAAAAHACMAAAAIAAAAAAAHACQAAAAIAAEAAAAbABcAAAAIAAYAAAAbABgAAAAIAAYAAAAbABkAAAAIAAYAAAAbABoAAAAIAAYAAAAcABsAAAAHAAUAAAAdABsAAAAHAAUAAAAeABsAAAAHAAUAAAAfABsAAAAHAAUAAAAgABcAAAAGAAYAAAAgABgAAAAGAAYAAAAgABkAAAAGAAYAAAAgABoAAAAGAAYAAAAcABYAAAAHAAcAAAAdABYAAAAHAAcAAAAeABYAAAAHAAcAAAAfABYAAAAHAAcAAAAcABoAAAALAAQAAAAfABoAAAALAAQAAAAhAB0AAQAAAAAACwAhAB4AAQAAAAAACwAhAB8AAQAAAAAACwAaAB0AAQAAAAAACwAaAB4AAQAAAAAACwAaAB8AAQAAAAAACwAYAB0AAQAAAAAACwAYAB4AAQAAAAAACwAYAB8AAQAAAAAACwAjAB0AAQAAAAAACwAjAB4AAQAAAAAACwAjAB8AAQAAAAAACwAjACEAAQAAAAAAAgAkACEAAQAAAAAAAgAkABgAAQAAAAAAAgAkABkAAQAAAAAAAgAXABQAAQAAAAAAAgAXABUAAQAAAAAAAgAXACEAAQAAAAAADQAYACEAAQAAAAAADQAXACAAAQAAAAAADQAYACAAAQAAAAAAEAAZACEAAQAAAAAAEAAZACAAAQAAAAAAEAAkACAAAQAAAAAAEAAjACAAAQAAAAAAEAAiACAAAQAAAAAAEAAhACAAAQAAAAAAEAAhACEAAQAAAAAAEAAiACEAAQAAAAAAEAAfACEAAQAAAAAAEAAgACEAAQAAAAAAEAAgACAAAQAAAAAAEAAeACEAAQAAAAAADAAcACEAAQAAAAAADAAdACEAAQAAAAAADAAQABgAAQAAAAAADAARABgAAQAAAAAADAABABgAAQAAAAAADAAHACEAAQAAAAAADAAHACIAAQAAAAAADAAJACAAAQAAAAAADAAKACAAAQAAAAAADAAJACEAAQAAAAAADAAJACIAAQAAAAAADAADABEAAAAIAAAAAAADABIAAAAIAAEAAAD6/xAAAAAGAAAAAAD7/xAAAAAHAAAAAAAEAB4AAAAJAAwAAAAEAB8AAAAJAA0AAAD//xcAAAAJAAwAAAD//xgAAAAJAA0AAAASABgAAAAJAAwAAAASABkAAAAJAA0AAAAPAB4AAAAJAAwAAAAPAB8AAAAJAA0AAAABAB4AAAAKAAwAAAABAB8AAAAKAA0AAAAAABcAAAAKAAwAAAAAABgAAAAKAA0AAAABABYAAAAKAAwAAAABABcAAAAKAA0AAAAMAB4AAAAKAAwAAAAMAB8AAAAKAA0AAAD8/xYAAAAKAAwAAAD8/xcAAAAKAA0AAAAIABYAAAAJAAwAAAAIABcAAAAJAA0AAAAFABYAAAAKAAwAAAAFABcAAAAKAA0AAAAEABYAAAAJAAwAAAAEABcAAAAJAA0AAAATABgAAAALAAQAAAAVABgAAAALAAQAAAAUABgAAAAKAAQAAAD8/w8AAQAAAAAAAgD8/xAAAQAAAAAAAgD5/w8AAQAAAAAADAD4/w8AAQAAAAAADAD5/xAAAQAAAAAADAD9/w8AAQAAAAAADAD4/xMAAQAAAAAADAD4/xIAAQAAAAAADAAJABgAAAAMAAoAAAAKABgAAAANAAoAAAA=") +tile_map_data = PackedByteArray("AAAEACAAAAAGAAAAAAAFACAAAAAHAAAAAAAGACAAAAAGAAAAAAAHACAAAAAHAAAAAAAAACAAAAAGAAAAAAABACAAAAAHAAAAAAD+/yAAAAAGAAAAAAD//yAAAAAHAAAAAAD+/yMAAAAIAAAAAAD+/yQAAAAIAAEAAAAHACMAAAAIAAAAAAAHACQAAAAIAAEAAAAbABcAAAAIAAYAAAAbABgAAAAIAAYAAAAbABkAAAAIAAYAAAAbABoAAAAIAAYAAAAcABsAAAAHAAUAAAAdABsAAAAHAAUAAAAeABsAAAAHAAUAAAAfABsAAAAHAAUAAAAgABcAAAAGAAYAAAAgABgAAAAGAAYAAAAgABkAAAAGAAYAAAAgABoAAAAGAAYAAAAcABYAAAAHAAcAAAAdABYAAAAHAAcAAAAeABYAAAAHAAcAAAAfABYAAAAHAAcAAAAcABoAAAALAAQAAAAfABoAAAALAAQAAAAhAB0AAQAAAAAACwAhAB4AAQAAAAAACwAhAB8AAQAAAAAACwAaAB0AAQAAAAAACwAaAB4AAQAAAAAACwAaAB8AAQAAAAAACwAYAB0AAQAAAAAACwAYAB4AAQAAAAAACwAYAB8AAQAAAAAACwAjAB0AAQAAAAAACwAjAB4AAQAAAAAACwAjAB8AAQAAAAAACwAjACEAAQAAAAAAAgAkACEAAQAAAAAAAgAkABgAAQAAAAAAAgAkABkAAQAAAAAAAgAXABQAAQAAAAAAAgAXABUAAQAAAAAAAgAXACEAAQAAAAAADQAYACEAAQAAAAAADQAXACAAAQAAAAAADQAYACAAAQAAAAAAEAAZACEAAQAAAAAAEAAZACAAAQAAAAAAEAAkACAAAQAAAAAAEAAjACAAAQAAAAAAEAAiACAAAQAAAAAAEAAhACAAAQAAAAAAEAAhACEAAQAAAAAAEAAiACEAAQAAAAAAEAAfACEAAQAAAAAAEAAgACEAAQAAAAAAEAAgACAAAQAAAAAAEAAeACEAAQAAAAAADAAcACEAAQAAAAAADAAdACEAAQAAAAAADAAQABgAAQAAAAAAEAARABgAAQAAAAAAEAABABgAAQAAAAAAEAAHACEAAQAAAAAAEAAHACIAAQAAAAAAEAAJACAAAQAAAAAAEAAKACAAAQAAAAAAEAAJACEAAQAAAAAAEAAJACIAAQAAAAAAEAADABEAAAAIAAAAAAADABIAAAAIAAEAAAD6/xAAAAAGAAAAAAD7/xAAAAAHAAAAAAAEAB4AAAAJAAwAAAAEAB8AAAAJAA0AAAD//xcAAAAJAAwAAAD//xgAAAAJAA0AAAASABgAAAAJAAwAAAASABkAAAAJAA0AAAAPAB4AAAAJAAwAAAAPAB8AAAAJAA0AAAABAB4AAAAKAAwAAAABAB8AAAAKAA0AAAAAABcAAAAKAAwAAAAAABgAAAAKAA0AAAABABYAAAAKAAwAAAABABcAAAAKAA0AAAAMAB4AAAAKAAwAAAAMAB8AAAAKAA0AAAD8/xYAAAAKAAwAAAD8/xcAAAAKAA0AAAAIABYAAAAJAAwAAAAIABcAAAAJAA0AAAAFABYAAAAKAAwAAAAFABcAAAAKAA0AAAAEABYAAAAJAAwAAAAEABcAAAAJAA0AAAATABgAAAALAAQAAAAVABgAAAALAAQAAAAUABgAAAAKAAQAAAD8/w8AAQAAAAAAEAD8/xAAAQAAAAAAEAD5/w8AAQAAAAAAEAD4/w8AAQAAAAAAEAD5/xAAAQAAAAAAEAD9/w8AAQAAAAAAEAD4/xMAAQAAAAAAEAD4/xIAAQAAAAAAEAAJABgAAAAMAAoAAAAKABgAAAANAAoAAAD6/xgAAAAMAAoAAAD7/xgAAAANAAoAAAD6/xoAAQAAAAAAEAD6/xsAAQAAAAAAEAD7/xsAAQAAAAAAEAD8/xsAAQAAAAAAEAD7/xoAAQAAAAAAEAD4/xAAAQAAAAAAEAAQABwAAQAAAAAAEAARABwAAQAAAAAAEAAHABwAAQAAAAAAEAAIABwAAQAAAAAAEAAJABwAAQAAAAAAEAAKABwAAQAAAAAAEAA=") tile_set = ExtResource("2_m7mag") metadata/_edit_lock_ = true @@ -89,7 +98,7 @@ position = Vector2(240, 368) position = Vector2(47, 368) [node name="HorizontalDoor2" parent="Tilemaps/Actors" instance=ExtResource("5_pqyv2")] -position = Vector2(-32, 367) +position = Vector2(-32, 368) State = 1 [node name="HorizontalDoor3" parent="Tilemaps/Actors" instance=ExtResource("5_pqyv2")] @@ -106,7 +115,7 @@ position = Vector2(-80, 262) collision_layer = 68 collision_mask = 0 script = ExtResource("9_cr26l") -Events = Array[Object]([SubResource("Resource_2ugqu")]) +Events = Array[Object]([SubResource("Resource_2ugqu"), SubResource("Resource_8anae")]) metadata/_edit_group_ = true [node name="Sprite2D" type="Sprite2D" parent="Tilemaps/Actors/Colonel"] @@ -120,16 +129,16 @@ shape = SubResource("CircleShape2D_cr26l") position = Vector2(275, 511) [node name="Mainframe" parent="Tilemaps/Actors" instance=ExtResource("18_27jx1")] -position = Vector2(248, 511) +position = Vector2(248, 519) [node name="Mainframe3" parent="Tilemaps/Actors" instance=ExtResource("18_27jx1")] -position = Vector2(264, 511) +position = Vector2(264, 519) [node name="Mainframe5" parent="Tilemaps/Actors" instance=ExtResource("18_27jx1")] -position = Vector2(-24, 238) +position = Vector2(-24, 247) [node name="Mainframe4" parent="Tilemaps/Actors" instance=ExtResource("18_27jx1")] -position = Vector2(287, 511) +position = Vector2(287, 519) [node name="Chair" parent="Tilemaps/Actors" instance=ExtResource("14_2ugqu")] position = Vector2(43, 286) diff --git a/Scenes/Props/MainFrame1.tscn b/Scenes/Props/MainFrame1.tscn index c8a98eba..5abbc96d 100644 --- a/Scenes/Props/MainFrame1.tscn +++ b/Scenes/Props/MainFrame1.tscn @@ -43,15 +43,18 @@ DebrisScene = ExtResource("2_pr6n8") metadata/_edit_group_ = true [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +position = Vector2(0, -8) sprite_frames = SubResource("SpriteFrames_kpm16") autoplay = "default" frame_progress = 0.193815 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false +position = Vector2(0, -8) shape = SubResource("RectangleShape2D_0nhpj") [node name="RigidBody2D" type="RigidBody2D" parent="."] +position = Vector2(0, -8) collision_layer = 64 collision_mask = 10 gravity_scale = 0.0 diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 61a56929..2a490b67 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -485,13 +485,13 @@ position = Vector2(-877, -530) position = Vector2(-854, -530) [node name="Mainframe6" parent="Factory Tilemaps/LevelProps" instance=ExtResource("46_ny2s2")] -position = Vector2(-1273, -433) +position = Vector2(-1273, -425) [node name="Mainframe12" parent="Factory Tilemaps/LevelProps" instance=ExtResource("46_ny2s2")] -position = Vector2(-1367, -261) +position = Vector2(-1367, -250) [node name="Mainframe7" parent="Factory Tilemaps/LevelProps" instance=ExtResource("46_ny2s2")] -position = Vector2(-1257, -433) +position = Vector2(-1257, -425) [node name="Mainframe8" parent="Factory Tilemaps/LevelProps" instance=ExtResource("47_y5mcc")] position = Vector2(-1245, -433) @@ -500,7 +500,7 @@ position = Vector2(-1245, -433) position = Vector2(-1237, -433) [node name="Mainframe10" parent="Factory Tilemaps/LevelProps" instance=ExtResource("46_ny2s2")] -position = Vector2(-1225, -433) +position = Vector2(-1225, -425) [node name="ControlPad5" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("12_hfkf1")] position = Vector2(-726, -484) diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres index a1f62619..d77b62ef 100644 --- a/Tilesets/factory_tileset.tres +++ b/Tilesets/factory_tileset.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=47 format=3 uid="uid://6k28roiljylj"] +[gd_resource type="TileSet" load_steps=48 format=3 uid="uid://6k28roiljylj"] [ext_resource type="Texture2D" uid="uid://tphqodqyere1" path="res://Tilesets/factory.png" id="1_70kxh"] [ext_resource type="PackedScene" uid="uid://bj28qiai2x2ar" path="res://Scenes/Props/Barrel.tscn" id="2_cxg4b"] @@ -17,6 +17,7 @@ [ext_resource type="PackedScene" uid="uid://bx2h6niaxi6mv" path="res://Scenes/Props/Box_Wood.tscn" id="9_ipvrl"] [ext_resource type="PackedScene" uid="uid://bnhck5eh0tqxf" path="res://Scenes/Props/MediumTerminal.tscn" id="9_wc4jy"] [ext_resource type="PackedScene" uid="uid://e80xujqyjoh" path="res://Scenes/Props/Box_Vertical.tscn" id="10_hg2bp"] +[ext_resource type="PackedScene" uid="uid://cqrkisw6jg24w" path="res://Scenes/Props/MainFrame1.tscn" id="10_hupu0"] [ext_resource type="Texture2D" uid="uid://df8t3kan5qgjb" path="res://Tilesets/Space.png" id="12_fb37q"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_l8pdw"] @@ -1050,6 +1051,7 @@ scenes/13/scene = ExtResource("6_fudr4") scenes/14/scene = ExtResource("7_k5ppi") scenes/15/scene = ExtResource("8_ubrnc") scenes/16/scene = ExtResource("9_ipvrl") +scenes/17/scene = ExtResource("10_hupu0") [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_wgdjv"] texture = ExtResource("12_fb37q")