diff --git a/music_player.tscn b/music_player.tscn new file mode 100644 index 0000000..c0218ca --- /dev/null +++ b/music_player.tscn @@ -0,0 +1,7 @@ +[gd_scene format=3 uid="uid://brfvu7b2fdm0i"] + +[ext_resource type="AudioStream" uid="uid://3c4uog8d4ahi" path="res://replace-me.mp3" id="1_fvyft"] + +[node name="MusicPlayer" type="AudioStreamPlayer" unique_id=1544811864] +stream = ExtResource("1_fvyft") +autoplay = true diff --git a/player/player.gd b/player/player.gd index c8a73fa..b7501ea 100644 --- a/player/player.gd +++ b/player/player.gd @@ -182,7 +182,8 @@ func _process(delta: float) -> void: func damage(damager: Node3D) -> void: if health <= 0: return if state == State.DASHING: - damager.kill() + if damager.has_method("kill"): + damager.kill() else: if damage_clock <= 0.: %CrashSFX.play() diff --git a/project.godot b/project.godot index 6f7d26d..3467af7 100644 --- a/project.godot +++ b/project.godot @@ -15,10 +15,15 @@ run/main_scene="uid://c04ppsrjrkxb6" config/features=PackedStringArray("4.6") config/icon="res://icon.svg" +[audio] + +buses/default_bus_layout="uid://bnw08msjouhf6" + [autoload] SignalBus="*uid://cj4jk5xvv2n3l" DebugMenu="*uid://bm0f0u35a8t7h" +MusicPlayer="*uid://brfvu7b2fdm0i" [display] diff --git a/replace-me.mp3 b/replace-me.mp3 new file mode 100644 index 0000000..9f7a46c Binary files /dev/null and b/replace-me.mp3 differ diff --git a/replace-me.mp3.import b/replace-me.mp3.import new file mode 100644 index 0000000..e046f80 --- /dev/null +++ b/replace-me.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://3c4uog8d4ahi" +path="res://.godot/imported/replace-me.mp3-7daf056da07c9c51dbd7ae078e9e0fc1.mp3str" + +[deps] + +source_file="res://replace-me.mp3" +dest_files=["res://.godot/imported/replace-me.mp3-7daf056da07c9c51dbd7ae078e9e0fc1.mp3str"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4