fix: Level 3 with new tiles part 1

src/BenefitialObjects/Coin.tscn

@@ -129,13 +129,13 @@ anims/fade_out = SubResource( 2 )
 anims/oscilating = SubResource( 3 )
 
 [node name="Sprite2" type="Sprite" parent="."]
-position = Vector2( 0, 2.62238 )
+position = Vector2( 0, 1.28561 )
 scale = Vector2( -0.484, -0.5 )
 texture = ExtResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="."]
 material = SubResource( 6 )
-position = Vector2( 0.0564964, 2.37193 )
+position = Vector2( 0.0560874, 1.24152 )
 texture = ExtResource( 317 )
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]

src/Contraptions/VendingMachine.tscn

@@ -66,7 +66,8 @@ one_shot = true
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )
-volume_db = -18.193
+volume_db = -14.0
+bus = "Effects"
 
 [connection signal="area_entered" from="ActivatorArea" to="." method="_on_ActivatorArea_area_entered"]
 [connection signal="area_exited" from="ActivatorArea" to="." method="_on_ActivatorArea_area_exited"]

src/Levels/4 Tutorial Level.tscn

@@ -128,6 +128,9 @@ unique_name_in_owner = true
 position = Vector2( -70, 1 )
 scale = Vector2( 0.878906, 0.936025 )
 
+[node name="BlobbySprite" parent="Blobby" index="5"]
+frame = 8
+
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 6 )
 
@@ -174,14 +177,8 @@ position = Vector2( 548, 89 )
 [node name="Spikes3" parent="Obstacles" instance=ExtResource( 12 )]
 position = Vector2( 572, 89 )
 
-[node name="Spikes5" parent="Obstacles" instance=ExtResource( 12 )]
-position = Vector2( 860, 401 )
-
 [node name="Spikes6" parent="Obstacles" instance=ExtResource( 12 )]
-position = Vector2( 860, 377 )
+position = Vector2( 860, 381 )
-
-[node name="Spikes7" parent="Obstacles" instance=ExtResource( 12 )]
-position = Vector2( 860, 425 )
 
 [node name="Coins" type="Node2D" parent="."]
 

src/Levels/6 Tutorial Level.tscn

@@ -132,7 +132,7 @@ position = Vector2( -142, 17 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 6
+frame = 7
 
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 53 )
@@ -152,7 +152,10 @@ tile_data = PoolIntArray( -524302, -536870907, 524291, -524301, -1073741819, 458
 [node name="DropThroughPlatforms" type="TileMap" parent="."]
 tile_set = ExtResource( 2 )
 cell_size = Vector2( 16, 16 )
+collision_layer = 128
+collision_mask = 128
 format = 1
+tile_data = PoolIntArray( 262140, 2, 0, 262141, 2, 1, 262142, 2, 2 )
 
 [node name="PlatformPlants" type="TileMap" parent="."]
 tile_set = SubResource( 5 )
@@ -166,7 +169,7 @@ elevator_time = 10
 [node name="Portal" parent="ElevatorButton" instance=ExtResource( 11 )]
 position = Vector2( -40, 40 )
 scale = Vector2( 0.5, 0.5 )
-next_scene = "res://src/Levels/Actual Level 1.tscn"
+next_scene = "res://src/Levels/Level 1.tscn"
 
 [node name="Flyer" parent="." instance=ExtResource( 13 )]
 position = Vector2( -64, 81 )

src/Levels/Legacy/Actual Level 3.tscn

@@ -108,7 +108,7 @@ position = Vector2( -168, 95 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 8
+frame = 7
 
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 9 )

src/Levels/Level 1.tscn

@@ -92,6 +92,7 @@ __meta__ = {
 "_edit_horizontal_guides_": [ 464.0 ],
 "_edit_vertical_guides_": [ 2880.0 ]
 }
+level_music = "res://assets/music/The Laboratory (LOOP).wav"
 
 [node name="SignalManager" parent="." instance=ExtResource( 5 )]
 
@@ -132,7 +133,7 @@ position = Vector2( -70, -1.90735e-06 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 9
+frame = 6
 
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 6 )
@@ -182,6 +183,8 @@ max_speed = 100
 
 [node name="DartingEnemy" parent="." instance=ExtResource( 20 )]
 position = Vector2( -446, 259 )
+speed = 200
+acceleration = 320
 
 [node name="TileMap" type="TileMap" parent="."]
 unique_name_in_owner = true
@@ -215,7 +218,7 @@ elevator_time = 16
 [node name="Portal" parent="ElevatorButton" instance=ExtResource( 7 )]
 position = Vector2( -48, -8 )
 scale = Vector2( 0.5, 0.5 )
-next_scene = "res://src/Levels/Actual Level 1.tscn"
+next_scene = "res://src/Levels/Level 2.tscn"
 
 [node name="LevelAmbiance" type="AudioStreamPlayer" parent="."]
 unique_name_in_owner = true

src/Levels/Level 2.tscn

@@ -94,6 +94,7 @@ __meta__ = {
 "_edit_horizontal_guides_": [ 464.0 ],
 "_edit_vertical_guides_": [ 2880.0 ]
 }
+level_music = "res://assets/music/The Laboratory (LOOP).wav"
 
 [node name="SignalManager" parent="." instance=ExtResource( 10 )]
 
@@ -133,7 +134,7 @@ position = Vector2( -70, -1.90735e-06 )
 scale = Vector2( 0.878906, 0.936025 )
 
 [node name="BlobbySprite" parent="Blobby" index="5"]
-frame = 8
+frame = 6
 
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 6 )
@@ -194,7 +195,7 @@ elevator_time = 30
 [node name="Portal" parent="ElevatorButton" instance=ExtResource( 7 )]
 position = Vector2( -60, -8 )
 scale = Vector2( 0.5, 0.5 )
-next_scene = "res://src/Levels/Actual Level 1.tscn"
+next_scene = "res://src/Levels/Level 3.tscn"
 
 [node name="FlyingLaserCutter" parent="." instance=ExtResource( 18 )]
 position = Vector2( 1248, 16 )

src/ObstacleObjects/Mine.gd

@@ -8,20 +8,20 @@ export var is_locked = true
 
 
 func _ready() -> void:
-    $Area2D.remove_from_group("harmful")
+	$Area2D.remove_from_group("harmful")
-    $Sprite/AnimationPlayer.play("unarmed")
+	$Sprite/AnimationPlayer.play("unarmed")
 
 
 func _on_Area2D_area_exited(area: Area2D) -> void:
-    $Timer.start()
+	$Timer.start()
 
 
 func _on_Timer_timeout() -> void:
-    is_locked = true
+	is_locked = true
-    $Area2D.add_to_group("harmful")
+	$Area2D.add_to_group("harmful")
-    $Sprite/AnimationPlayer.play("arming")
+	$Sprite/AnimationPlayer.play("arming")
 
 
 func _on_AnimationPlayer_animation_finished(anim_name: String) -> void:
-    if(anim_name == "arming"):
+	if(anim_name == "arming"):
-        $Sprite/AnimationPlayer.play("armed")
+		$Sprite/AnimationPlayer.play("armed")

src/Platforms/FlyingLaserCutter.gd

@@ -19,35 +19,35 @@ var mass = 10
 # Maybe keep returning paths free and crush player when in the way
 
 func _ready() -> void:
-    $FlyingLaserCutterBody/Sprite/AnimationPlayer.play("default")
+	$FlyingLaserCutterBody/Sprite/AnimationPlayer.play("default")
 
 
 func _physics_process(delta: float) -> void:
-    if !flyoff_triggered:
+	if !flyoff_triggered:
-        for ray in trigger_rays:
+		for ray in trigger_rays:
-            # When player has been hit on the way
+			# When player has been hit on the way
-            if (has_hit_player && body.position.x > 0):
+			if (has_hit_player && body.position.x > 0):
-                break
+				break
-            if ray.is_colliding():
+			if ray.is_colliding():
-                var collider = ray.get_collider()
+				var collider = ray.get_collider()
-                if collider.is_in_group("player"):
+				if collider.is_in_group("player"):
-                    flyoff_triggered = true
+					flyoff_triggered = true
-                    body.set("motion/sync_to_physics", false)
+					body.set("motion/sync_to_physics", false)
-                    break
+					break
-        if body.position.x > 0:
+		if body.position.x > 0:
-            velocity=1
+			velocity=1
-            body.position.x += (max_velocity/3)*-1*delta
+			body.position.x += (max_velocity/3)*-1*delta
-    elif body.position.x == 0:
+	elif body.position.x == 0:
-        has_hit_player = false
+		has_hit_player = false
-    if flyoff_triggered:
+	if flyoff_triggered:
-        velocity = PhysicsFunc.two_step_euler(
+		velocity = PhysicsFunc.two_step_euler(
-            velocity, acceleration_force, mass, delta
+			velocity, acceleration_force, mass, delta
-        )
+		)
-        velocity = clamp(velocity, 0, max_velocity)
+		velocity = clamp(velocity, 0, max_velocity)
-        var collision = body.move_and_collide(velocity*global_facing*delta,true)
+		var collision = body.move_and_collide(velocity*global_facing*delta,true)
-        if collision != null:
+		if collision != null:
-            if !collision.collider.is_in_group("player"):
+			if !collision.collider.is_in_group("player"):
-                body.set("motion/sync_to_physics", true)
+				body.set("motion/sync_to_physics", true)
-            else:
+			else:
-                has_hit_player = true
+				has_hit_player = true
-            flyoff_triggered = false
+			flyoff_triggered = false

src/Platforms/FlyingPlatform.gd

@@ -26,7 +26,7 @@ func _ready() -> void:
 func _start_tween():
 	$FlyTween.interpolate_property($PlatformBody, "position",
 	tween_values[0], tween_values[1], time,
-		Tween.TRANS_QUAD, Tween.EASE_IN_OUT)
+		Tween.TRANS_SINE, Tween.EASE_IN_OUT)
 	$FlyTween.start()
 	
 

src/Platforms/FlyingPlatform.tscn

@@ -64,7 +64,7 @@ moving_platform_apply_velocity_on_leave = 2
 
 [node name="FlyingSound" type="AudioStreamPlayer2D" parent="PlatformBody"]
 stream = ExtResource( 3 )
-volume_db = -8.0
+volume_db = -12.0
 autoplay = true
 max_distance = 480.0
 attenuation = 3.73213
@@ -76,7 +76,7 @@ texture = ExtResource( 2 )
 hframes = 20
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="PlatformBody/Sprite"]
-autoplay = "v2"
+autoplay = "v1"
 anims/RESET = SubResource( 1 )
 anims/v1 = SubResource( 2 )
 anims/v2 = SubResource( 3 )

src/Platforms/FlyingPlatformSmol.tscn

@@ -80,7 +80,7 @@ texture = ExtResource( 2 )
 hframes = 17
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="PlatformBody/Sprite"]
-autoplay = "v2"
+autoplay = "v1"
 anims/RESET = SubResource( 1 )
 anims/v1 = SubResource( 2 )
 anims/v2 = SubResource( 3 )
@@ -94,7 +94,7 @@ polygon = PoolVector2Array( -6, -10, 6, -10, 5.5, 0, 5.25, 5, -5.25, 5, -5.5, 0
 
 [node name="FlyingSound" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource( 3 )
-volume_db = -8.0
+volume_db = -12.0
 autoplay = true
 max_distance = 480.0
 attenuation = 3.73213

src/Sounds/default_bus_layout.tres

@@ -41,12 +41,12 @@ resource_name = "LowPassFilter"
 cutoff_hz = 3000.0
 
 [resource]
-bus/0/volume_db = -9.897
+bus/0/volume_db = -13.9794
 bus/1/name = "Music"
 bus/1/solo = false
 bus/1/mute = false
 bus/1/bypass_fx = false
-bus/1/volume_db = -7.9588
+bus/1/volume_db = 0.0
 bus/1/send = "Master"
 bus/1/effect/0/effect = SubResource( 1 )
 bus/1/effect/0/enabled = false
@@ -56,7 +56,7 @@ bus/2/name = "Effects"
 bus/2/solo = false
 bus/2/mute = false
 bus/2/bypass_fx = false
-bus/2/volume_db = -1.9382
+bus/2/volume_db = 0.0
 bus/2/send = "Master"
 bus/2/effect/0/effect = SubResource( 3 )
 bus/2/effect/0/enabled = false

src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn

@@ -255,8 +255,6 @@ follow_focus = true
 
 [node name="ActionKeyList" type="VBoxContainer" parent="Panel/KeymapViewer/ScrollContainer"]
 unique_name_in_owner = true
-margin_right = 600.0
-margin_bottom = 189.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource( 14 )