Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry

1 files changed, 25 insertions, 3 deletions

diff --git a/client/player/item_bubble.gd b/client/player/item_bubble.gd
index b5dd7352..626fb7b6 100644
--- a/client/player/item_bubble.gd
+++ b/client/player/item_bubble.gd
@@ -18,14 +18,30 @@ extends MeshInstance3D
 
 signal submit_message
 
-@onready var base: Node3D = $SubViewport/ItemMessage/SubViewportContainer/SubViewport/ItemBase
+@onready var base: Node3D = $SubViewport/ItemMessage/VBoxContainer/SubViewportContainer/SubViewport/ItemBase
+@onready var progress: ProgressBar = $SubViewport/ItemMessage/VBoxContainer/ProgressBar
 
 var item: Item
+var timeout_remaining := 0.
+var timeout_initial := 0.
+var progress_style = preload("res://menu/theme/item_bubble_progress_style.tres")
 
-func set_item(t: String):
+func _init():
+	progress_style = progress_style.duplicate()
+
+func set_item(t: String, timeout_initial_: float, timeout_remaining_: float):
+	if timeout_remaining_ == 0.:
+		remove_item()
+		return
+	
 	visible = true
 	item = ItemFactory.produce(t, base)
 	base.add_child(item)
+	
+	timeout_remaining = timeout_remaining_
+	timeout_initial = timeout_initial_
+	progress.max_value = timeout_initial
+	progress.value = timeout_remaining
 
 func remove_item():
 	visible = false
@@ -33,5 +49,11 @@ func remove_item():
 		item.queue_free()
 
 func _process(delta):
-	if item != null:
+	if visible:
 		item.rotation.y += delta * TAU * .05
+		timeout_remaining -= delta
+		progress.value = timeout_remaining
+		var x: float = timeout_remaining / timeout_initial
+		progress_style.bg_color = Color(min((1-x) * 2, 1), min(x * 2, 1), 0.)
+		progress_style.corner_radius_bottom_right = max(32.-(1.-x)*320, 0)
+		progress.add_theme_stylebox_override("fill", progress_style)