diff --git a/assets/Tutorial_shield.jpeg.import b/assets/Tutorial_shield.jpeg.import index 0434bc8..2721869 100644 --- a/assets/Tutorial_shield.jpeg.import +++ b/assets/Tutorial_shield.jpeg.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://baeea1yfs0cnn" -path="res://.godot/imported/Tutorial_shield.jpeg-d9b563c9ca34dc1a19e82a0ec964c1b9.ctex" +path="res://.godot/imported/Tutorial_Shield.jpeg-6b96e6b9716aced42153397e827ce868.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/Tutorial_shield.jpeg" -dest_files=["res://.godot/imported/Tutorial_shield.jpeg-d9b563c9ca34dc1a19e82a0ec964c1b9.ctex"] +source_file="res://assets/Tutorial_Shield.jpeg" +dest_files=["res://.godot/imported/Tutorial_Shield.jpeg-6b96e6b9716aced42153397e827ce868.ctex"] [params] diff --git a/assets/embient.ogg b/assets/ambient.ogg similarity index 100% rename from assets/embient.ogg rename to assets/ambient.ogg diff --git a/assets/ambient.ogg.import b/assets/ambient.ogg.import new file mode 100644 index 0000000..82a6a1f --- /dev/null +++ b/assets/ambient.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://boyy2vpjoxb6l" +path="res://.godot/imported/ambient.ogg-35a37efc4b30706a227e17f0453e3a99.oggvorbisstr" + +[deps] + +source_file="res://assets/ambient.ogg" +dest_files=["res://.godot/imported/ambient.ogg-35a37efc4b30706a227e17f0453e3a99.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/embient.ogg.import b/assets/embient.ogg.import deleted file mode 100644 index 61ee4ef..0000000 --- a/assets/embient.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://boyy2vpjoxb6l" -path="res://.godot/imported/embient.ogg-00ba3a3987abe1f685c6b6795345f522.oggvorbisstr" - -[deps] - -source_file="res://assets/embient.ogg" -dest_files=["res://.godot/imported/embient.ogg-00ba3a3987abe1f685c6b6795345f522.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/scripts/SFX.gd b/scripts/SFX.gd index ff762fd..bc27894 100644 --- a/scripts/SFX.gd +++ b/scripts/SFX.gd @@ -7,7 +7,7 @@ class_name SFX # damage.ogg — player takes damage # ambient.ogg — looping background ambience -const _BASE := "res://assets/sfx/" +const _BASE := "res://assets/" static func _play(name: String, parent: Node, volume_db: float = 0.0, pitch: float = 1.0) -> void: var path := _BASE + name @@ -16,6 +16,9 @@ static func _play(name: String, parent: Node, volume_db: float = 0.0, pitch: flo var stream := load(path) as AudioStream if stream == null: return + var ogg = stream as AudioStreamOggVorbis + if ogg != null: + ogg.loop = false var p := AudioStreamPlayer.new() p.stream = stream p.volume_db = volume_db