summaryrefslogtreecommitdiff
path: root/client/player/player.gd
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-06-28 17:10:56 +0200
committermetamuffin <metamuffin@disroot.org>2024-06-28 17:10:56 +0200
commit1a46bf0d72ed0099bf9ca79fe83874ec4d63b875 (patch)
tree24d4865b8a66f661f77195e1c334ded4489f1854 /client/player/player.gd
parent61d81259387f95fd17a5156251eaf9c8688ca120 (diff)
parent45abc0fd1630d930bcd56d1a107a29e298d8e20f (diff)
downloadhurrycurry-1a46bf0d72ed0099bf9ca79fe83874ec4d63b875.tar
hurrycurry-1a46bf0d72ed0099bf9ca79fe83874ec4d63b875.tar.bz2
hurrycurry-1a46bf0d72ed0099bf9ca79fe83874ec4d63b875.tar.zst
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/player/player.gd')
-rw-r--r--client/player/player.gd6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/player/player.gd b/client/player/player.gd
index 4806b19d..b20eba14 100644
--- a/client/player/player.gd
+++ b/client/player/player.gd
@@ -28,7 +28,8 @@ var position_ = Vector2(0, 0)
var position_anim = Vector2(0, 0)
var character: Character = preload("res://player/character/character.tscn").instantiate()
-var bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate()
+var chat_bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate()
+var item_bubble: ItemBubble = preload("res://player/item_bubble.tscn").instantiate()
var hand: Item = null
var hand_base: Node3D = Node3D.new()
@@ -47,7 +48,8 @@ func _init(_id: int, new_name: String, pos: Vector2, new_character_idx: int, new
hand_base.position = HAND_BASE_POSITION
add_child(hand_base)
- add_child(bubble)
+ add_child(chat_bubble)
+ add_child(item_bubble)
character_idx = new_character_idx