aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-11 23:22:00 +0200
committermetamuffin <metamuffin@disroot.org>2025-10-11 23:22:00 +0200
commit94fab766512de7b3be8123c4238a7902ce7b35c4 (patch)
treeb7b13d8b42c183175c7caf86536b0324fe1f6585
parent6c72cc28bcbad679d66fa3eb22b16b9a745d85c6 (diff)
downloadhurrycurry-94fab766512de7b3be8123c4238a7902ce7b35c4.tar
hurrycurry-94fab766512de7b3be8123c4238a7902ce7b35c4.tar.bz2
hurrycurry-94fab766512de7b3be8123c4238a7902ce7b35c4.tar.zst
Only rotate marker for non round items
-rw-r--r--client/map/items/basket.gd2
-rw-r--r--client/map/items/food_processor.gd2
-rw-r--r--client/map/items/item.gd2
-rw-r--r--client/player/controllable_player.gd2
4 files changed, 7 insertions, 1 deletions
diff --git a/client/map/items/basket.gd b/client/map/items/basket.gd
index 9137c7bd..8b19243a 100644
--- a/client/map/items/basket.gd
+++ b/client/map/items/basket.gd
@@ -26,6 +26,8 @@ func _init(owned_by_: Node3D):
base.add_child(bubbles)
base.position.z = -.075
+func is_round(): return false
+
func add_contents(contents: Array[String]):
for i in contents:
match i:
diff --git a/client/map/items/food_processor.gd b/client/map/items/food_processor.gd
index 14706677..63bcfebf 100644
--- a/client/map/items/food_processor.gd
+++ b/client/map/items/food_processor.gd
@@ -25,6 +25,8 @@ func _init(owned_by_: Node3D):
add_child(load("res://map/items/food_processor.tscn").instantiate())
add_child(processing)
+func is_round(): return false
+
func add_contents(contents: Array[String]):
for i in contents:
match i:
diff --git a/client/map/items/item.gd b/client/map/items/item.gd
index 39c7afc1..d6e65618 100644
--- a/client/map/items/item.gd
+++ b/client/map/items/item.gd
@@ -58,6 +58,8 @@ func _init(owned_by_: Node3D):
add_child(base)
owned_by = owned_by_
+func is_round(): return true
+
func add_contents(contents: Array[String]):
for i in contents:
match i:
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd
index 90c32ede..93cc0481 100644
--- a/client/player/controllable_player.gd
+++ b/client/player/controllable_player.gd
@@ -318,7 +318,7 @@ func update_interact_target_dirsnap():
best_distance = cursor_tile_distance
var tile = game.map.get_tile_instance(offset_cursor)
target_visual = tile.item_base.global_position
- if tile.item != null:
+ if tile.item != null and not tile.item.is_round():
marker.rotation.y = tile.item.rotation.y
else: marker.rotation.y = 0.
target_tile = offset_cursor