aboutsummaryrefslogtreecommitdiff
path: root/client/player
diff options
context:
space:
mode:
authortpart <tpart120@proton.me>2024-08-15 23:22:02 +0200
committertpart <tpart120@proton.me>2024-08-15 23:22:02 +0200
commit82446e9f9b626f47e18b90e6841b1bec2b7800f6 (patch)
tree8a13a6d4c78057737f61e505c6d106b30fa8247a /client/player
parente0ce9534563de59c080b0bd4f014cccbf329fcad (diff)
downloadhurrycurry-82446e9f9b626f47e18b90e6841b1bec2b7800f6.tar
hurrycurry-82446e9f9b626f47e18b90e6841b1bec2b7800f6.tar.bz2
hurrycurry-82446e9f9b626f47e18b90e6841b1bec2b7800f6.tar.zst
Implement new message protocol in client
Diffstat (limited to 'client/player')
-rw-r--r--client/player/player.gd22
1 files changed, 6 insertions, 16 deletions
diff --git a/client/player/player.gd b/client/player/player.gd
index 0e06d521..0a4d24db 100644
--- a/client/player/player.gd
+++ b/client/player/player.gd
@@ -66,7 +66,6 @@ func _init(_id: int, new_name: String, pos: Vector2, new_character_idx: int, new
movement_base.add_child(effect)
clear_timer.one_shot = true
- clear_timer.wait_time = 5.
add_child(clear_timer)
marker.visible = false
add_child(marker)
@@ -151,23 +150,14 @@ func clear_message():
chat_bubble.remove_text()
effect.clear_effect()
-func item_message(item_name: String, persist: bool):
+func item_message(item_name: String, timeout_initial: float, timeout_remaining: float):
item_bubble.set_item(item_name)
- if persist:
- clear_timer.stop()
- else:
- clear_timer.start()
+ clear_timer.start(timeout_remaining)
-func text_message(m: String, persist: bool):
+func text_message(m: String, timeout_initial: float, timeout_remaining: float):
chat_bubble.set_text(m)
- if persist:
- clear_timer.stop()
- else:
- clear_timer.start()
+ clear_timer.start(timeout_remaining)
-func effect_message(effect_name: String, persist: bool):
+func effect_message(effect_name: String, timeout_initial: float, timeout_remaining: float):
effect.set_effect(effect_name)
- if persist:
- clear_timer.stop()
- else:
- clear_timer.start()
+ clear_timer.start(timeout_remaining)