diff --git a/growth/level.tscn b/growth/level.tscn index d656120..a1b8a55 100644 --- a/growth/level.tscn +++ b/growth/level.tscn @@ -11,4 +11,4 @@ [node name="Virus" parent="." instance=ExtResource("2_oi3di")] position = Vector2(468, -3) -[node name="Node2D" parent="." instance=ExtResource("3_oi3di")] +[node name="MusicMixer" parent="." instance=ExtResource("3_oi3di")] diff --git a/growth/music.tscn b/growth/music.tscn index d3ac726..67fa7de 100644 --- a/growth/music.tscn +++ b/growth/music.tscn @@ -21,13 +21,13 @@ script = ExtResource("1_w5q55") [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = SubResource("AudioStreamInteractive_lr66j") -[node name="BossArea" type="Area2D" parent="AudioStreamPlayer"] -collision_layer = 0 +[node name="BossArea" type="Area2D" parent="."] +collision_layer = 16 collision_mask = 16 -[node name="CollisionShape2D" type="CollisionShape2D" parent="AudioStreamPlayer/BossArea"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="BossArea"] scale = Vector2(50, 50) shape = SubResource("CircleShape2D_khlsn") -[connection signal="area_entered" from="AudioStreamPlayer/BossArea" to="." method="_on_boss_area_entered"] -[connection signal="area_exited" from="AudioStreamPlayer/BossArea" to="." method="_on_boss_area_exited"] +[connection signal="area_entered" from="BossArea" to="." method="_on_boss_area_entered"] +[connection signal="area_exited" from="BossArea" to="." method="_on_boss_area_exited"] diff --git a/growth/music_mixer.gd b/growth/music_mixer.gd index 60a8432..c844af2 100644 --- a/growth/music_mixer.gd +++ b/growth/music_mixer.gd @@ -1,18 +1,22 @@ extends Node func _ready() -> void: - $AudioStreamPlayer.play() + $AudioStreamPlayer.play() func _on_boss_area_entered(_body: Node2D) -> void: - if $AudioStreamPlayer["parameters/switch_to_clip"] == "Boss": - return - - $AudioStreamPlayer["parameters/switch_to_clip"] = "-> Boss" + print_debug("Boss area entered") + if $AudioStreamPlayer["parameters/switch_to_clip"] == "Boss": + print_debug("Already in boss music") + return + + $AudioStreamPlayer["parameters/switch_to_clip"] = "-> Boss" func _on_boss_area_exited(_body: Node2D) -> void: - if $AudioStreamPlayer["parameters/switch_to_clip"] == "Base": - return - - $AudioStreamPlayer["parameters/switch_to_clip"] = "-> Base" \ No newline at end of file + print_debug("Boss area exited") + if $AudioStreamPlayer["parameters/switch_to_clip"] == "Base": + print_debug("Already in base music") + return + + $AudioStreamPlayer["parameters/switch_to_clip"] = "-> Base" \ No newline at end of file diff --git a/growth/player.gd b/growth/player.gd index 74b7fad..a77bf9d 100644 --- a/growth/player.gd +++ b/growth/player.gd @@ -45,8 +45,7 @@ func update_move_direction(): func update_target_coords(): target = get_viewport().get_mouse_position() - var self_view_position = self.position - camera.position + screen_size / 2 - sprite.look_at(target - self_view_position) + sprite.look_at(get_global_mouse_position()) func update_camera_position(): if not camera: diff --git a/growth/player.tscn b/growth/player.tscn index aa28608..3c2af90 100644 --- a/growth/player.tscn +++ b/growth/player.tscn @@ -17,7 +17,7 @@ animations = [{ [sub_resource type="CircleShape2D" id="CircleShape2D_i3pqv"] [node name="Player" type="CharacterBody2D"] -collision_layer = 5 +collision_layer = 21 collision_mask = 31 motion_mode = 1 script = ExtResource("1_4flbx")