From 382d032f55e49280ba2511a70ca5ed3b5127dea4 Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 7 Jul 2024 21:16:46 +0200 Subject: fix single door rotation --- client/map/tiles/door.gd | 7 ++++--- client/map/tiles/tile.gd | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'client/map') diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd index 5d86c000..ab778158 100644 --- a/client/map/tiles/door.gd +++ b/client/map/tiles/door.gd @@ -14,7 +14,7 @@ # along with this program. If not, see . # class_name Door -extends Floor +extends WallTile func _init(rename: String, neighbors: Array): super(rename, neighbors) @@ -22,6 +22,7 @@ func _init(rename: String, neighbors: Array): var facing = 0 for i in range(4): if neighbors[i] == "door": - facing = i % 4 + facing = i + turn_facing(facing) base.add_child(load("res://map/tiles/door.tscn").instantiate()) - turn_facing(facing) + diff --git a/client/map/tiles/tile.gd b/client/map/tiles/tile.gd index 220a4395..6a73c596 100644 --- a/client/map/tiles/tile.gd +++ b/client/map/tiles/tile.gd @@ -41,7 +41,7 @@ func _init(rename: String, _neighbors: Array): item_base = item_base_ func turn_facing(facing: Facing): - base.rotate_y(facing * 0.5 * PI + PI) + base.rotation.y = facing * 0.5 * PI + PI # defines where items go when interacting static func interact_target() -> Vector3: -- cgit v1.2.3-70-g09d2 From b9807def2cc76d5d389bf196c9f0b455c143ab48 Mon Sep 17 00:00:00 2001 From: nokoe Date: Sun, 7 Jul 2024 21:41:59 +0200 Subject: item volume level --- client/audio/sound.gd | 4 +++- client/map/items/food_processor.gd | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'client/map') diff --git a/client/audio/sound.gd b/client/audio/sound.gd index c4ef0ad2..f0100756 100644 --- a/client/audio/sound.gd +++ b/client/audio/sound.gd @@ -18,15 +18,17 @@ func play_hover_maybe(element): return play_hover() -func item_progress(item: Item, running: AudioStream, stopping: AudioStream) -> int: +func item_progress(item: Item, running: AudioStream, stopping: AudioStream, volume=0.) -> int: item_id += 1 var running_player: AudioStreamPlayer3D = AudioStreamPlayer3D.new() running_player.stream = running running_player.name = "Running%d" % item_id + running_player.volume_db = volume add_child(running_player) var stopping_player: AudioStreamPlayer3D = AudioStreamPlayer3D.new() stopping_player.stream = stopping stopping_player.name = "Stopping%d" % item_id + stopping_player.volume_db = volume running_player.play() add_child(stopping_player) item_sounds[item_id] = [item, running_player, stopping_player, false] diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd index 588777ff..6a04da00 100644 --- a/client/map/items/food_processor.gd +++ b/client/map/items/food_processor.gd @@ -32,7 +32,8 @@ func progress(p: float, warn: bool): sound_id = Sound.item_progress( self, preload("res://map/items/sounds/food_processor_running.ogg"), - preload("res://map/items/sounds/food_processor_stopping.ogg") + preload("res://map/items/sounds/food_processor_stopping.ogg"), + -10. ) func finish(warn: bool): -- cgit v1.2.3-70-g09d2