diff --git a/Scenes/Items/Yin_Yang_Orb.tscn b/Scenes/Items/Yin_Yang_Orb.tscn index 845b5949..31992465 100644 --- a/Scenes/Items/Yin_Yang_Orb.tscn +++ b/Scenes/Items/Yin_Yang_Orb.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://ihy1ew7bo6no"] [ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_a80ku"] -[ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="2_cgnjk"] +[ext_resource type="Resource" uid="uid://b0qheywm2wej3" path="res://Resources/Items/Yin_Yang_Orb.tres" id="2_a80ku"] [ext_resource type="Texture2D" uid="uid://efghydyw2q8o" path="res://Sprites/Items/YingYangOrb.png" id="3_a80ku"] [sub_resource type="CircleShape2D" id="CircleShape2D_jtwy2"] @@ -10,7 +10,7 @@ collision_layer = 4 collision_mask = 2 script = ExtResource("1_a80ku") -LootTable = [ExtResource("2_cgnjk")] +LootTable = [ExtResource("2_a80ku")] [node name="Sprite2D" type="Sprite2D" parent="."] texture = ExtResource("3_a80ku") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 69f504a1..7252e48c 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -438,19 +438,8 @@ position = Vector2(-1210, -370) [node name="HealthStation2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("38_kuhg5")] position = Vector2(-1688, -232) -[node name="Label" type="Label" parent="Factory Tilemaps/LevelProps"] -offset_left = -1544.0 -offset_top = -658.0 -offset_right = -1418.0 -offset_bottom = -609.0 -text = "The level is unfinished from here on, -you can take this telepad to the -rebel base (unfinished too) or check -out the rest of the (short) level" -label_settings = ExtResource("14_c4c20") - [node name="LevelTeleporter" parent="Factory Tilemaps/LevelProps" instance=ExtResource("44_q5xi2")] -position = Vector2(-1488, -672) +position = Vector2(-2000, -867) LevelPath = "res://Scenes/Maps/RebelBase.tscn" IsEnabled = true @@ -512,7 +501,7 @@ IsEnabled = true Target = NodePath("../DebugTeleporter") [node name="DebugTeleporter" parent="Factory Tilemaps/LevelProps" instance=ExtResource("30_8fdby")] -position = Vector2(-861, 206) +position = Vector2(-1490.7, -620.52) Invisible = true metadata/_edit_group_ = true @@ -814,6 +803,7 @@ position = Vector2(-808, -171) [node name="VerticalDoor2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("15_mgtvp")] position = Vector2(-1332, -648) +State = 1 [node name="VerticalDoor3" parent="Factory Tilemaps/LevelProps" instance=ExtResource("15_mgtvp")] position = Vector2(-1940, -648) @@ -944,14 +934,10 @@ position = Vector2(-1220, -402) [node name="Fairy10" parent="Factory Tilemaps/LevelProps" instance=ExtResource("73_s4x1s")] position = Vector2(-1080, -399) -[node name="Turret360" parent="Factory Tilemaps/LevelProps" instance=ExtResource("62_h0jm4")] -position = Vector2(-1254, -587) - -[node name="Turret361" parent="Factory Tilemaps/LevelProps" instance=ExtResource("62_h0jm4")] -position = Vector2(-1925, -709) - -[node name="Turret362" parent="Factory Tilemaps/LevelProps" instance=ExtResource("62_h0jm4")] -position = Vector2(-1927, -586) +[node name="Turret362" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("DefeatScript") instance=ExtResource("62_h0jm4")] +position = Vector2(-1928, -659) +DefeatScript = NodePath("../VerticalDoor3") +ActivationType = 5 [node name="AcidBridge" type="Area2D" parent="Factory Tilemaps/LevelProps" groups=["Acid"]] position = Vector2(-1760, -641) @@ -970,7 +956,7 @@ scale = Vector2(1, 5.985) State = 1 [node name="GreenKeyCard" parent="Factory Tilemaps/LevelProps" instance=ExtResource("36_f8fh1")] -position = Vector2(-1598, -628) +position = Vector2(-1145, -812) [node name="KeycardReaderGreen" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("76_usuub")] position = Vector2(-1640, -619) @@ -987,11 +973,26 @@ position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] Requirements = [ExtResource("84_ma1ta")] +[node name="Ammo6" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-872, -220) + +[node name="Ammo9" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-1638, -813) + [node name="IcicleRepeater2" parent="Factory Tilemaps/LevelProps" instance=ExtResource("32_xof4a")] position = Vector2(-923, 69) -[node name="Ammo1" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] -position = Vector2(-872, -220) +[node name="IcicleRepeater3" parent="Factory Tilemaps/LevelProps" instance=ExtResource("32_xof4a")] +position = Vector2(-1609, -808) + +[node name="Ammo10" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-1130, -813) + +[node name="Ammo11" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-1176, -812) + +[node name="Ammo12" parent="Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] +position = Vector2(-1163, -812) [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 @@ -1032,3 +1033,6 @@ AlarmSound = ExtResource("79_jn1m0") process_mode = 3 autoplay = true MusicData = ExtResource("82_ksslq") + +[node name="Ammo1" parent="." instance=ExtResource("34_17pjh")] +position = Vector2(-1624, -813) diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres index 5a01067a..2f430eaa 100644 --- a/Tilesets/factory_tileset.tres +++ b/Tilesets/factory_tileset.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=41 format=3 uid="uid://6k28roiljylj"] +[gd_resource type="TileSet" load_steps=43 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"] @@ -35,12 +35,24 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 +[sub_resource type="NavigationPolygon" id="NavigationPolygon_k5ppi"] +vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) +agent_radius = 0.0 + [sub_resource type="NavigationPolygon" id="NavigationPolygon_ml1qs"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 +[sub_resource type="NavigationPolygon" id="NavigationPolygon_ubrnc"] +vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) +agent_radius = 0.0 + [sub_resource type="NavigationPolygon" id="NavigationPolygon_x7tqo"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) @@ -149,6 +161,7 @@ texture = ExtResource("1_70kxh") 0:0/0 = 0 1:0/0 = 0 2:0/0 = 0 +2:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_ubrnc") 3:0/0 = 0 3:0/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:0/0 = 0 @@ -962,6 +975,7 @@ texture = ExtResource("1_70kxh") 12:2/0 = 0 12:2/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:3/0 = 0 +12:3/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_k5ppi") [sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_qg3vu"] resource_name = "Props"