diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index ec3fc651..40098429 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=22 format=3 uid="uid://d1lc8lhq1b05p"] +[gd_resource type="Resource" script_class="DebugMapSelectData" load_steps=24 format=3 uid="uid://d1lc8lhq1b05p"] [ext_resource type="Script" path="res://Scripts/Resources/DebugMenu/DebugMapSelectData.cs" id="1_6kwth"] [ext_resource type="Script" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_ov731"] @@ -68,6 +68,18 @@ Enabled = true Path = "res://Scenes/Maps/RebelBase.tscn" _name = "Rebel Base" +[sub_resource type="Resource" id="Resource_maxpt"] +script = ExtResource("1_ov731") +EggIndex = 0 +StartingEquipment = [] + +[sub_resource type="Resource" id="Resource_pein5"] +script = ExtResource("2_tnajf") +Enabled = true +Path = "res://Scenes/Maps/Level2.tscn" +_name = "Level 2" +StartData = SubResource("Resource_maxpt") + [sub_resource type="Resource" id="Resource_6wrc7"] script = ExtResource("2_tnajf") Enabled = true @@ -94,4 +106,4 @@ _name = "Default Scene" [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_6wrc7"), SubResource("Resource_x3w7w"), SubResource("Resource_ajht5"), SubResource("Resource_7vmdn")]) +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")]) diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn new file mode 100644 index 00000000..52de15d1 --- /dev/null +++ b/Scenes/Maps/Level2.tscn @@ -0,0 +1,74 @@ +[gd_scene load_steps=13 format=4 uid="uid://6a6tjohypmmb"] + +[ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_t2k72"] +[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_v2pdx"] +[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_3pdf7"] +[ext_resource type="Script" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_s1vkf"] +[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_06rc0"] +[ext_resource type="Script" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"] +[ext_resource type="Script" path="res://Scenes/CameraController.gd" id="7_lxkiw"] +[ext_resource type="Script" path="res://Scripts/InventoryManager.cs" id="8_wp8ds"] +[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"] +[ext_resource type="Script" path="res://Scenes/CameraTarget.gd" id="10_4nd4a"] +[ext_resource type="Script" path="res://Scripts/AlarmManager.cs" id="11_7an4p"] + +[sub_resource type="Resource" id="Resource_6wo78"] +script = ExtResource("4_s1vkf") +EggIndex = 0 +StartingEquipment = [] + +[node name="GameScene" type="Node2D"] +script = ExtResource("1_t2k72") +PlayerTemplate = ExtResource("2_v2pdx") +SpawnMarkers = { +0: NodePath("PlayerStartPosition") +} +WeaponTemplate = ExtResource("3_3pdf7") +MapStartData = SubResource("Resource_6wo78") + +[node name="Tilemaps" type="Node2D" parent="."] + +[node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayer")] +tile_map_data = PackedByteArray("AAAEABAAAAAEAAIAAAAEABEAAAAEAAIAAAAEABIAAAAEAAIAAAAEABMAAAAEAAIAAAAEABQAAAAEAAIAAAAEABUAAAAEAAIAAAAEABYAAAAEAAIAAAAFABAAAAAEAAIAAAAFABEAAAAEAAIAAAAFABIAAAAEAAIAAAAFABMAAAAEAAIAAAAFABQAAAAEAAIAAAAFABUAAAAEAAIAAAAFABYAAAAEAAIAAAAGABAAAAAEAAIAAAAGABEAAAAEAAIAAAAGABIAAAAEAAIAAAAGABMAAAAEAAIAAAAGABQAAAAEAAIAAAAGABUAAAAEAAIAAAAGABYAAAAEAAIAAAAHABAAAAAEAAIAAAAHABEAAAAEAAIAAAAHABIAAAAEAAIAAAAHABMAAAAEAAIAAAAHABQAAAAEAAIAAAAHABUAAAAEAAIAAAAHABYAAAAEAAIAAAAIABAAAAAEAAIAAAAIABEAAAAEAAIAAAAIABIAAAAEAAIAAAAIABMAAAAEAAIAAAAIABQAAAAEAAIAAAAIABUAAAAEAAIAAAAIABYAAAAEAAIAAAAJABAAAAAEAAIAAAAJABEAAAAEAAIAAAAJABIAAAAEAAIAAAAJABMAAAAEAAIAAAAJABQAAAAEAAIAAAAJABUAAAAEAAIAAAAJABYAAAAEAAIAAAAKABAAAAAEAAIAAAAKABEAAAAEAAIAAAAKABIAAAAEAAIAAAAKABMAAAAEAAIAAAAKABQAAAAEAAIAAAAKABUAAAAEAAIAAAAKABYAAAAEAAIAAAADABAAAAAEAAIAAAADABEAAAAEAAIAAAADABIAAAAEAAIAAAADABMAAAAEAAIAAAADABQAAAAEAAIAAAADABUAAAAEAAIAAAADABYAAAAEAAIAAAADABcAAAAEAAIAAAADABgAAAAEAAIAAAAEABcAAAAEAAIAAAAEABgAAAAEAAIAAAAFABcAAAAEAAIAAAAFABgAAAAEAAIAAAAGABcAAAAEAAIAAAAGABgAAAAEAAIAAAAHABcAAAAEAAIAAAAHABgAAAAEAAIAAAAIABcAAAAEAAIAAAAIABgAAAAEAAIAAAAJABcAAAAEAAIAAAAJABgAAAAEAAIAAAAKABcAAAAEAAIAAAAKABgAAAAEAAIAAAALABAAAAAEAAIAAAALABEAAAAEAAIAAAALABIAAAAEAAIAAAALABMAAAAEAAIAAAALABQAAAAEAAIAAAALABUAAAAEAAIAAAALABYAAAAEAAIAAAALABcAAAAEAAIAAAALABgAAAAEAAIAAAA=") +tile_set = ExtResource("5_06rc0") +script = ExtResource("6_up0ka") +_solidLayer = NodePath("../Solid") +metadata/_edit_lock_ = true + +[node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]] +tile_map_data = PackedByteArray("AAACAA0AAAAAAAsAAAADAA0AAAABAAQAAAAEAA0AAAABAAQAAAAFAA0AAAABAAQAAAAGAA0AAAABAAQAAAAHAA0AAAABAAQAAAAIAA0AAAABAAQAAAAJAA0AAAABAAQAAAAKAA0AAAABAAQAAAALAA0AAAABAAQAAAAMAA0AAAABAAsAAAAMAA4AAAAAAAQAAAAMAA8AAAAAAAQAAAAMABAAAAAAAAQAAAAMABEAAAAAAAQAAAAMABMAAAAAAAQAAAAMABIAAAAAAAQAAAAMABQAAAAAAAQAAAAMABUAAAAAAAQAAAAMABYAAAAAAAQAAAAMABcAAAAAAAQAAAAMABgAAAAAAAQAAAAMABkAAAABAAwAAAALABkAAAABAAQAAAAKABkAAAABAAQAAAAJABkAAAABAAQAAAAIABkAAAABAAQAAAAHABkAAAABAAQAAAAGABkAAAABAAQAAAAFABkAAAABAAQAAAAEABkAAAABAAQAAAADABkAAAABAAQAAAACABkAAAAAAAwAAAACABgAAAAAAAQAAAACABYAAAAAAAQAAAACABcAAAAAAAQAAAACABUAAAAAAAQAAAACABQAAAAAAAQAAAACABIAAAAAAAQAAAACABMAAAAAAAQAAAACABEAAAAAAAQAAAACABAAAAAAAAQAAAACAA8AAAAAAAQAAAACAA4AAAAAAAQAAAADAA4AAAABAAEAAAADAA8AAAABAAEAAAAEAA4AAAABAAEAAAAEAA8AAAABAAEAAAAFAA4AAAABAAEAAAAFAA8AAAABAAEAAAAGAA4AAAABAAEAAAAGAA8AAAABAAEAAAAHAA4AAAABAAEAAAAHAA8AAAABAAEAAAAIAA4AAAABAAEAAAAIAA8AAAABAAEAAAAJAA4AAAABAAEAAAAJAA8AAAABAAEAAAAKAA4AAAABAAEAAAAKAA8AAAABAAEAAAALAA4AAAABAAEAAAALAA8AAAABAAEAAAA=") +tile_set = ExtResource("5_06rc0") +metadata/_edit_lock_ = true + +[node name="Props" type="TileMapLayer" parent="Tilemaps"] +tile_set = ExtResource("5_06rc0") +metadata/_edit_lock_ = true + +[node name="Actors" type="Node2D" parent="Tilemaps"] +metadata/_edit_lock_ = true + +[node name="CameraController" type="Camera2D" parent="."] +script = ExtResource("7_lxkiw") +pixel_snap = false + +[node name="ReferenceRect" type="ReferenceRect" parent="."] +visible = false +offset_left = -38.0 +offset_top = -39.0 +offset_right = 124.0 +offset_bottom = 44.0 + +[node name="InventoryManager" type="Node2D" parent="."] +script = ExtResource("8_wp8ds") + +[node name="HUD" parent="." instance=ExtResource("9_mnq21")] + +[node name="CameraTarget" type="Node2D" parent="."] +position = Vector2(115, 328) +script = ExtResource("10_4nd4a") + +[node name="PlayerStartPosition" type="Marker2D" parent="."] +position = Vector2(111, 305) + +[node name="AlarmManager" type="Node2D" parent="."] +script = ExtResource("11_7an4p") diff --git a/Scenes/Props/BigTank.tscn b/Scenes/Props/BigTank.tscn index fa98bc86..67838d68 100644 --- a/Scenes/Props/BigTank.tscn +++ b/Scenes/Props/BigTank.tscn @@ -23,6 +23,7 @@ ExplosionParticles = ExtResource("3_cvv71") texture = ExtResource("4_tvvum") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +visible = false position = Vector2(0, -1) shape = SubResource("RectangleShape2D_0nhpj") @@ -31,5 +32,6 @@ collision_layer = 64 collision_mask = 10 [node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false position = Vector2(0, -1) shape = SubResource("RectangleShape2D_s3n6b") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 956c8649..c34829ef 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -138,7 +138,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_nylk0"] +[sub_resource type="Resource" id="Resource_cxaaj"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -652,7 +652,7 @@ Events = Array[Object]([SubResource("Resource_068l7"), SubResource("Resource_l3n [node name="BossBattleStartScript" parent="." instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_nylk0")]) +Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_cxaaj")]) [node name="Enemy8" parent="." instance=ExtResource("47_u1ve6")] position = Vector2(-968, 206) @@ -684,3 +684,9 @@ position = Vector2(-728, 57) [node name="StartPosition" type="Marker2D" parent="."] position = Vector2(-808, -167) + +[node name="VerticalDoor" parent="." instance=ExtResource("15_mgtvp")] +position = Vector2(-1404, -647) + +[node name="VerticalDoor2" parent="." instance=ExtResource("15_mgtvp")] +position = Vector2(-1572, -632)