diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/map/items/raw_steak_pot.gd | 11 | ||||
| -rw-r--r-- | client/map/items/sounds/frying.ogg | bin | 0 -> 83502 bytes | |||
| -rw-r--r-- | client/map/items/sounds/frying.ogg.import | 19 | ||||
| -rw-r--r-- | client/map/tiles/sink.gd | 10 | ||||
| -rw-r--r-- | client/map/tiles/sounds/sink_running.ogg | bin | 0 -> 41925 bytes | |||
| -rw-r--r-- | client/map/tiles/sounds/sink_running.ogg.import | 19 | ||||
| -rw-r--r-- | client/map/tiles/sounds/sink_stopping.ogg | bin | 0 -> 15104 bytes | |||
| -rw-r--r-- | client/map/tiles/sounds/sink_stopping.ogg.import | 19 | ||||
| -rw-r--r-- | client/player/controllable_player.gd | 8 |
9 files changed, 85 insertions, 1 deletions
diff --git a/client/map/items/raw_steak_pot.gd b/client/map/items/raw_steak_pot.gd index 992554ea..437ba5de 100644 --- a/client/map/items/raw_steak_pot.gd +++ b/client/map/items/raw_steak_pot.gd @@ -18,4 +18,13 @@ extends Pot func _init(owned_by_: Node3D): super(owned_by_) - base.add_child(load("res://map/items/raw_steak.tscn").instantiate()) + base.add_child(preload("res://map/items/raw_steak.tscn").instantiate()) + +func progress(p: float, warn: bool): + super(p, warn) + if sound_id == null: + sound_id = Sound.item_progress( + self, + preload("res://map/items/sounds/frying.ogg"), + null + ) diff --git a/client/map/items/sounds/frying.ogg b/client/map/items/sounds/frying.ogg Binary files differnew file mode 100644 index 00000000..f28c2b5d --- /dev/null +++ b/client/map/items/sounds/frying.ogg diff --git a/client/map/items/sounds/frying.ogg.import b/client/map/items/sounds/frying.ogg.import new file mode 100644 index 00000000..c1a2f08d --- /dev/null +++ b/client/map/items/sounds/frying.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dwxmp68tcimxm" +path="res://.godot/imported/frying.ogg-753cdb19c878434ad9938a863ed9efd3.oggvorbisstr" + +[deps] + +source_file="res://map/items/sounds/frying.ogg" +dest_files=["res://.godot/imported/frying.ogg-753cdb19c878434ad9938a863ed9efd3.oggvorbisstr"] + +[params] + +loop=true +loop_offset=0.0 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/client/map/tiles/sink.gd b/client/map/tiles/sink.gd index 013742e8..a7599b8e 100644 --- a/client/map/tiles/sink.gd +++ b/client/map/tiles/sink.gd @@ -17,6 +17,8 @@ class_name Sink extends Counter var bubbles: SinkBubbles = preload("res://map/tiles/sink_bubbles.tscn").instantiate() +var running: AudioStreamPlayer3D = AudioStreamPlayer3D.new() +var stopping: AudioStreamPlayer3D = AudioStreamPlayer3D.new() func _init(rename: String, neighbors: Array): super(rename, neighbors) @@ -28,15 +30,23 @@ func _init(rename: String, neighbors: Array): base.add_child(load("res://map/tiles/sink_backsplash.tscn").instantiate()) _: base.add_child(load("res://map/tiles/sink.tscn").instantiate()) + running.stream = preload("res://map/tiles/sounds/sink_running.ogg") + add_child(running) + stopping.stream = preload("res://map/tiles/sounds/sink_stopping.ogg") + add_child(stopping) func progress(p: float, warn: bool): super(p, warn) if item is Plate: bubbles.start() + if not running.playing: + running.play() func finish(warn: bool): super(warn) bubbles.stop() + running.stop() + stopping.play() func set_item(i: Item): super(i) diff --git a/client/map/tiles/sounds/sink_running.ogg b/client/map/tiles/sounds/sink_running.ogg Binary files differnew file mode 100644 index 00000000..8d493a0a --- /dev/null +++ b/client/map/tiles/sounds/sink_running.ogg diff --git a/client/map/tiles/sounds/sink_running.ogg.import b/client/map/tiles/sounds/sink_running.ogg.import new file mode 100644 index 00000000..124c3c4f --- /dev/null +++ b/client/map/tiles/sounds/sink_running.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c6c023ryhashi" +path="res://.godot/imported/sink_running.ogg-88096b0ef99f7949fd63107ecbc20e55.oggvorbisstr" + +[deps] + +source_file="res://map/tiles/sounds/sink_running.ogg" +dest_files=["res://.godot/imported/sink_running.ogg-88096b0ef99f7949fd63107ecbc20e55.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/map/tiles/sounds/sink_stopping.ogg b/client/map/tiles/sounds/sink_stopping.ogg Binary files differnew file mode 100644 index 00000000..7a60b39b --- /dev/null +++ b/client/map/tiles/sounds/sink_stopping.ogg diff --git a/client/map/tiles/sounds/sink_stopping.ogg.import b/client/map/tiles/sounds/sink_stopping.ogg.import new file mode 100644 index 00000000..a09d1ff7 --- /dev/null +++ b/client/map/tiles/sounds/sink_stopping.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dxg0d44daffgr" +path="res://.godot/imported/sink_stopping.ogg-e96f2f0413b9f3d34c1241474c1f3744.oggvorbisstr" + +[deps] + +source_file="res://map/tiles/sounds/sink_stopping.ogg" +dest_files=["res://.godot/imported/sink_stopping.ogg-e96f2f0413b9f3d34c1241474c1f3744.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index c4c29566..da2cffcd 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -142,6 +142,14 @@ func progress(p: float, warn: bool): super(p, warn) Input.start_joy_vibration(0, 0.5, 0.1, 0.15) +func put_item(tile: Tile): + super(tile) + Input.start_joy_vibration(0, 0.1, 0.0, 0.075) + +func take_item(tile: Tile): + super(tile) + Input.start_joy_vibration(0, 0.1, 0.0, 0.075) + func interact(): var tile = game.map.get_tile_instance(target) if tile != null: |