diff --git a/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres b/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres index 5433dfb8..811cdf25 100644 --- a/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres +++ b/Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres @@ -1,7 +1,6 @@ -[gd_resource type="Resource" script_class="BulletScript" load_steps=6 format=3 uid="uid://cmra7n6so1x4u"] +[gd_resource type="Resource" script_class="BulletScript" load_steps=5 format=3 uid="uid://cmra7n6so1x4u"] [ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="1_lkipe"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="2_omk5v"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_v7d4m"] [ext_resource type="Script" uid="uid://bngko08ho85p6" path="res://Scripts/Resources/BulletScript.cs" id="3_omk5v"] @@ -13,7 +12,7 @@ rotationSpeed = 20.0 _rotationOffset = 0.0 duration = 60.0 spread = 360.0 -burstInterval = 0.2 +burstInterval = 0.6 ShotsPerBurst = 4 BurstRate = 0.8 _targetPlayer = false @@ -24,7 +23,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_omk5v")]([]) +TimeModifiers = [] WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 3fbfaf2b..da8dc5c6 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=86 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=88 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"] @@ -85,6 +85,12 @@ point_count = 2 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mq37i"] size = Vector2(89, 57) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_5j8ks"] +size = Vector2(39, 85) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_sb7g3"] +size = Vector2(23, 23) + [sub_resource type="AtlasTexture" id="AtlasTexture_6h3t3"] atlas = ExtResource("33_v8wj6") region = Rect2(0, 0, 16, 16) @@ -496,6 +502,19 @@ collision_mask = 0 position = Vector2(27.5, -2.5) shape = SubResource("RectangleShape2D_mq37i") +[node name="Acid3" type="Area2D" parent="Tilemaps/Actors" groups=["Acid"]] +position = Vector2(-106.06, 647.033) +collision_layer = 256 +collision_mask = 0 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Tilemaps/Actors/Acid3"] +position = Vector2(82.5595, 88.467) +shape = SubResource("RectangleShape2D_5j8ks") + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="Tilemaps/Actors/Acid3"] +position = Vector2(-38.4405, -38.533) +shape = SubResource("RectangleShape2D_sb7g3") + [node name="BigTankHorizontal" parent="Tilemaps/Actors" instance=ExtResource("30_i668q")] position = Vector2(-306, 530) @@ -505,30 +524,25 @@ position = Vector2(-274, 530) [node name="SwitchBox" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("30_47klv")] position = Vector2(-152, 707) StartingState = 0 -Targets = [NodePath("../HorizontalForceField"), NodePath("../FloorEmitter"), NodePath("../FloorEmitter2"), NodePath("../FloorEmitter3"), NodePath("../VerticalDoor3")] +Targets = [NodePath("../HorizontalForceField"), NodePath("../FloorEmitter"), NodePath("../FloorEmitter3"), NodePath("../VerticalDoor3")] [node name="HorizontalForceField" parent="Tilemaps/Actors" instance=ExtResource("31_hvfip")] position = Vector2(-48, 480) [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Tilemaps/Actors"] -position = Vector2(289.455, 319.659) +position = Vector2(-639.524, 293.027) sprite_frames = SubResource("SpriteFrames_qco45") autoplay = "default" frame = 22 frame_progress = 0.83544 [node name="FloorEmitter" parent="Tilemaps/Actors" instance=ExtResource("33_6h3t3")] -position = Vector2(-97, 661) -Script = ExtResource("35_imrxd") -InvertSignal = true - -[node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("33_6h3t3")] -position = Vector2(-170.149, 591.864) +position = Vector2(-132, 575) Script = ExtResource("35_imrxd") InvertSignal = true [node name="FloorEmitter3" parent="Tilemaps/Actors" instance=ExtResource("33_6h3t3")] -position = Vector2(-282.728, 648.41) +position = Vector2(-209, 575) Script = ExtResource("35_imrxd") InvertSignal = true @@ -559,6 +573,7 @@ position = Vector2(306, 326) [node name="Elevator2" parent="Tilemaps/Actors" instance=ExtResource("23_577wb")] position = Vector2(-528, 912) curve = SubResource("Curve2D_qo7ri") +StartingState = 2 [node name="Elevator3" parent="Tilemaps/Actors" instance=ExtResource("23_577wb")] position = Vector2(-704, 512)