Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung

scripts/circle_timer.gd

@@ -0,0 +1,24 @@
+extends Sprite3D
+
+var timer: Timer
+
+func _ready():
+	material_override
+
+func set_timer(p_timer: Timer):
+	timer = p_timer
+	update()
+
+func clear_timer():
+	timer = null
+	update()
+
+func _process(delta):
+	update()
+
+func update():
+	if timer != null:
+		visible = true
+		material_override.set_shader_param("percent", timer.time_left / timer.wait_time)
+	else:
+		visible = false

scripts/crafting_station/crafting_station.gd

@@ -20,6 +20,7 @@ onready var gen_timer = $"%gen_timer"
 onready var progress_text = $"%progress_text"
 onready var item_dump = $"%item_dump"
 onready var status_light = $"%status_light"
+onready var circle_timer = $circle_timer
 
 var item_slots = null
 var state = null

scripts/crafting_station/state/working.gd

@@ -17,9 +17,11 @@ func enter_from(state):
 	ctx.gen_timer.start()
 	ctx.status_light.activate()
 	ctx.progress_text.text = "Progress: 0%"
+	ctx.circle_timer.set_timer(ctx.gen_timer)
 
 func exit_to(state):
 	ctx.gen_timer.stop()
+	ctx.circle_timer.clear_timer()
 
 func update(delta):
 	var time_left : float = ctx.gen_timer.time_left

scripts/hydroponics_station/state/growing.gd

@@ -16,9 +16,10 @@ func enter_from(state):
 	ctx.get_node("grow_timer").start()
 	ctx.status_light.activate()
 	ctx.item_dump.enabled = false
+	ctx.get_node("circle_timer").set_timer(ctx.get_node("grow_timer"))
 
 func exit_to(state):
-	pass
+	ctx.get_node("circle_timer").clear_timer()
 
 func on_coin_machine_coin_requirement_met(player):
 	assert(false, "coin machine should be disabled while growing")

scripts/item_generator/item_generator.gd

@@ -20,6 +20,7 @@ onready var gen_timer = $"%gen_timer"
 onready var item_dump = $"%item_dump"
 onready var status_light = $"%status_light"
 onready var progress_text = $"%progress_text"
+onready var circle_timer = $circle_timer
 
 var state = null
 var item_slots

scripts/item_generator/state/working.gd

@@ -17,9 +17,10 @@ func enter_from(state):
 	ctx.status_light.activate()
 	ctx.gen_timer.start()
 	ctx.emit_signal("gen_started")
+	ctx.circle_timer.set_timer(ctx.gen_timer)
 
 func exit_to(state):
-	pass
+	ctx.circle_timer.clear_timer()
 
 func update(delta):
 	var time_left : float = ctx.gen_timer.time_left

scripts/oven/state/cooking.gd

@@ -17,9 +17,10 @@ func enter_from(state):
 
 	ctx.get_node("cook_timer").start()
 	ctx.get_node("status_light").activate()
+	ctx.get_node("circle_timer").set_timer(ctx.get_node("cook_timer"))
 
 func exit_to(state):
-	pass
+	ctx.get_node("circle_timer").clear_timer()
 
 func on_coin_machine_coin_requirement_met(player):
 	assert(false, "coin machine should be disabled while growing")