diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-07 23:06:04 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-07 23:06:04 +0200 |
| commit | 9d14e2470f2b50374ed4230ffcac33482afaeb0b (patch) | |
| tree | 83d7351ffc299cd0d735534d46921ad3644a7a4d /client/map | |
| parent | cd6e8f3886d764847f92ad75d397e2f2f6ad930a (diff) | |
| parent | 247457682736e8cdc20fb13c3628380229fc3d32 (diff) | |
| download | hurrycurry-9d14e2470f2b50374ed4230ffcac33482afaeb0b.tar hurrycurry-9d14e2470f2b50374ed4230ffcac33482afaeb0b.tar.bz2 hurrycurry-9d14e2470f2b50374ed4230ffcac33482afaeb0b.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/map')
| -rw-r--r-- | client/map/items/food_processor.gd | 3 | ||||
| -rw-r--r-- | client/map/tiles/door.gd | 7 | ||||
| -rw-r--r-- | client/map/tiles/tile.gd | 2 |
3 files changed, 7 insertions, 5 deletions
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): 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 <https://www.gnu.org/licenses/>. # 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: |