diff options
Diffstat (limited to 'client/map/items')
20 files changed, 170 insertions, 5 deletions
diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd index f2226e5f..588777ff 100644 --- a/client/map/items/food_processor.gd +++ b/client/map/items/food_processor.gd @@ -28,10 +28,18 @@ func progress(p: float, warn: bool): processing.emitting = true processing.rotation.y += p * TAU base.rotation.y += p * TAU + if sound_id == null: + sound_id = Sound.item_progress( + self, + preload("res://map/items/sounds/food_processor_running.ogg"), + preload("res://map/items/sounds/food_processor_stopping.ogg") + ) func finish(warn: bool): super(warn) - processing.emitting = false + if sound_id != null: + processing.emitting = false + Sound.item_finished(sound_id) static func base_position() -> Vector3: return Vector3(0., 0.4, 0.) diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 84d3f3fa..6433d5db 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -22,6 +22,7 @@ var base: Node3D = Node3D.new() var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate() var take_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() var put_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() +var sound_id func _init(owned_by_: Node3D): progress_instance.position.y = 1 @@ -50,8 +51,8 @@ func finish(_warn: bool): progress_instance.visible = false func setup_sounds(): - take_sound.setup([preload("res://map/sounds/generic_up.ogg")]) - put_sound.setup([preload("res://map/sounds/plate_down.ogg")]) + take_sound.setup([preload("res://map/items/sounds/generic_take.ogg")]) + put_sound.setup([preload("res://map/items/sounds/plate_put.ogg")]) func take(): take_sound.play_random() diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd index 9d2fe538..73ffc5d9 100644 --- a/client/map/items/plate.gd +++ b/client/map/items/plate.gd @@ -21,8 +21,8 @@ func _init(owned_by_: Node3D): add_child(load("res://map/items/plate.tscn").instantiate()) func setup_sounds(): - take_sound.setup([preload("res://map/sounds/plate_up.ogg")]) - put_sound.setup([preload("res://map/sounds/plate_down.ogg")]) + take_sound.setup([preload("res://map/items/sounds/plate_take.ogg")]) + put_sound.setup([preload("res://map/items/sounds/plate_put.ogg")]) static func base_position() -> Vector3: return Vector3(0., 0.05, 0.) diff --git a/client/map/items/pot.gd b/client/map/items/pot.gd index 89cbf4c4..e802b7e9 100644 --- a/client/map/items/pot.gd +++ b/client/map/items/pot.gd @@ -35,5 +35,9 @@ func finish(warn: bool): super(warn) steam.emitting = false +func setup_sounds(): + take_sound.setup([preload("res://map/items/sounds/pot_take.ogg")]) + put_sound.setup([preload("res://map/items/sounds/pot_put.ogg")]) + static func base_position() -> Vector3: return Vector3(0., 0.015, 0.) diff --git a/client/map/items/sounds/food_processor_running.ogg b/client/map/items/sounds/food_processor_running.ogg Binary files differnew file mode 100644 index 00000000..10ebaf90 --- /dev/null +++ b/client/map/items/sounds/food_processor_running.ogg diff --git a/client/map/items/sounds/food_processor_running.ogg.import b/client/map/items/sounds/food_processor_running.ogg.import new file mode 100644 index 00000000..d16ab2a5 --- /dev/null +++ b/client/map/items/sounds/food_processor_running.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://rxjywx4vm0v8" +path="res://.godot/imported/food_processor_running.ogg-6506a6a5653ba2f2b6b730a02c0666b6.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/food_processor_running.ogg" +dest_files=["res://.godot/imported/food_processor_running.ogg-6506a6a5653ba2f2b6b730a02c0666b6.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/food_processor_stopping.ogg b/client/map/items/sounds/food_processor_stopping.ogg Binary files differnew file mode 100644 index 00000000..471e264a --- /dev/null +++ b/client/map/items/sounds/food_processor_stopping.ogg diff --git a/client/map/items/sounds/food_processor_stopping.ogg.import b/client/map/items/sounds/food_processor_stopping.ogg.import new file mode 100644 index 00000000..88ad40f0 --- /dev/null +++ b/client/map/items/sounds/food_processor_stopping.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dghbc6sebonde" +path="res://.godot/imported/food_processor_stopping.ogg-ff77c875a73e7d6e0dc852e7de936ae8.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/food_processor_stopping.ogg" +dest_files=["res://.godot/imported/food_processor_stopping.ogg-ff77c875a73e7d6e0dc852e7de936ae8.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/generic_put.ogg b/client/map/items/sounds/generic_put.ogg Binary files differnew file mode 100644 index 00000000..2646fc02 --- /dev/null +++ b/client/map/items/sounds/generic_put.ogg diff --git a/client/map/items/sounds/generic_put.ogg.import b/client/map/items/sounds/generic_put.ogg.import new file mode 100644 index 00000000..c3c06725 --- /dev/null +++ b/client/map/items/sounds/generic_put.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://74413o382cgr" +path="res://.godot/imported/generic_put.ogg-71f756ad7da95a854dc079b882d88098.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/generic_put.ogg" +dest_files=["res://.godot/imported/generic_put.ogg-71f756ad7da95a854dc079b882d88098.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/generic_take.ogg b/client/map/items/sounds/generic_take.ogg Binary files differnew file mode 100644 index 00000000..89577f19 --- /dev/null +++ b/client/map/items/sounds/generic_take.ogg diff --git a/client/map/items/sounds/generic_take.ogg.import b/client/map/items/sounds/generic_take.ogg.import new file mode 100644 index 00000000..90ee9e85 --- /dev/null +++ b/client/map/items/sounds/generic_take.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dimmyptj1wxlm" +path="res://.godot/imported/generic_take.ogg-58b7a86e64dc39c372d275df9a89f825.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/generic_take.ogg" +dest_files=["res://.godot/imported/generic_take.ogg-58b7a86e64dc39c372d275df9a89f825.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/plate_put.ogg b/client/map/items/sounds/plate_put.ogg Binary files differnew file mode 100644 index 00000000..17059fa1 --- /dev/null +++ b/client/map/items/sounds/plate_put.ogg diff --git a/client/map/items/sounds/plate_put.ogg.import b/client/map/items/sounds/plate_put.ogg.import new file mode 100644 index 00000000..e748930c --- /dev/null +++ b/client/map/items/sounds/plate_put.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bmsdt2xav3dfi" +path="res://.godot/imported/plate_put.ogg-4e332f97bec21a96276803836308400a.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/plate_put.ogg" +dest_files=["res://.godot/imported/plate_put.ogg-4e332f97bec21a96276803836308400a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/plate_take.ogg b/client/map/items/sounds/plate_take.ogg Binary files differnew file mode 100644 index 00000000..4ee7fd37 --- /dev/null +++ b/client/map/items/sounds/plate_take.ogg diff --git a/client/map/items/sounds/plate_take.ogg.import b/client/map/items/sounds/plate_take.ogg.import new file mode 100644 index 00000000..c8f13933 --- /dev/null +++ b/client/map/items/sounds/plate_take.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dytee1arrjb2j" +path="res://.godot/imported/plate_take.ogg-dd95f70134d26571c8fd012af38d2e8a.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/plate_take.ogg" +dest_files=["res://.godot/imported/plate_take.ogg-dd95f70134d26571c8fd012af38d2e8a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/pot_put.ogg b/client/map/items/sounds/pot_put.ogg Binary files differnew file mode 100644 index 00000000..13e1abf9 --- /dev/null +++ b/client/map/items/sounds/pot_put.ogg diff --git a/client/map/items/sounds/pot_put.ogg.import b/client/map/items/sounds/pot_put.ogg.import new file mode 100644 index 00000000..363d3784 --- /dev/null +++ b/client/map/items/sounds/pot_put.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dfmty54bviifx" +path="res://.godot/imported/pot_put.ogg-1c886ef2769ab239bdd47fb1253a9552.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/pot_put.ogg" +dest_files=["res://.godot/imported/pot_put.ogg-1c886ef2769ab239bdd47fb1253a9552.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/items/sounds/pot_take.ogg b/client/map/items/sounds/pot_take.ogg Binary files differnew file mode 100644 index 00000000..2736101b --- /dev/null +++ b/client/map/items/sounds/pot_take.ogg diff --git a/client/map/items/sounds/pot_take.ogg.import b/client/map/items/sounds/pot_take.ogg.import new file mode 100644 index 00000000..4e8e0f4f --- /dev/null +++ b/client/map/items/sounds/pot_take.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cpeig1y5bsar2" +path="res://.godot/imported/pot_take.ogg-d1e77bdb4ef71d0a80a6b45ecef61ed6.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/pot_take.ogg" +dest_files=["res://.godot/imported/pot_take.ogg-d1e77bdb4ef71d0a80a6b45ecef61ed6.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 |