diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-01 20:02:50 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-01 20:02:50 +0200 |
| commit | dbd0b769af6267426496b18bd788b8a68165c667 (patch) | |
| tree | 59dc08576efd7ff9812e53606095b93c79a9aafd /client/map/items | |
| parent | 76cadb3d882851f7de1aa4b0aac03ace08d06df2 (diff) | |
| parent | 90ea661221ebf29c26bc44308d31fcf04f79ca2c (diff) | |
| download | hurrycurry-dbd0b769af6267426496b18bd788b8a68165c667.tar hurrycurry-dbd0b769af6267426496b18bd788b8a68165c667.tar.bz2 hurrycurry-dbd0b769af6267426496b18bd788b8a68165c667.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/map/items')
| -rw-r--r-- | client/map/items/item.gd | 9 | ||||
| -rw-r--r-- | client/map/items/plate.gd | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/client/map/items/item.gd b/client/map/items/item.gd index d3acf200..7ab80fab 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -20,14 +20,17 @@ var owned_by: Node3D var base: Node3D = Node3D.new() var progress_instance: ProgressBar3D = preload("res://map/progress.tscn").instantiate() -var sound_instance: PlayRandom = preload("res://audio/play_random.tscn").instantiate() +var take_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() +var put_sound: PlayRandom = preload("res://audio/play_random.tscn").instantiate() func _init(owned_by_: Node3D): progress_instance.position.y = 1 progress_instance.visible = false add_child(progress_instance) - add_child(sound_instance) - sound_instance.volume_db = -16 + take_sound.volume_db = -16 + put_sound.volume_db = -16 + add_child(take_sound) + add_child(put_sound) base.position = base_position() add_child(base) owned_by = owned_by_ diff --git a/client/map/items/plate.gd b/client/map/items/plate.gd index 88403b55..9b462e5c 100644 --- a/client/map/items/plate.gd +++ b/client/map/items/plate.gd @@ -19,10 +19,15 @@ extends Item func _init(owned_by_: Node3D): super(owned_by_) add_child(load("res://map/items/plate.tscn").instantiate()) - sound_instance.setup([preload("res://map/sounds/plate_up.ogg")]) + take_sound.setup([preload("res://map/sounds/plate_up.ogg")]) + put_sound.setup([preload("res://map/sounds/plate_down.ogg")]) func take(): - sound_instance.play_random() + take_sound.play_random() + super() + +func put(): + put_sound.play_random() super() static func base_position() -> Vector3: |