summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan <logan@cflip.net>2022-09-26 23:19:32 -0600
committerLogan <logan@cflip.net>2022-09-26 23:19:32 -0600
commit04d378315e14c6cec924b7d1669172794842daa8 (patch)
tree00633bc860bb2203da3019e1497a48c9803f43d2
parentbe5b2a0d96cb17c5ff2726e3bd466ee43715d5a6 (diff)
Renaming and refactoring of interface scene.
-rw-r--r--scenes/interface.tscn6
-rw-r--r--scripts/interface.gd18
2 files changed, 10 insertions, 14 deletions
diff --git a/scenes/interface.tscn b/scenes/interface.tscn
index b99b28f..b05fb17 100644
--- a/scenes/interface.tscn
+++ b/scenes/interface.tscn
@@ -7,18 +7,18 @@ margin_right = 40.0
margin_bottom = 40.0
script = ExtResource( 3 )
-[node name="Score Label" type="Label" parent="."]
+[node name="ScoreLabel" type="Label" parent="."]
margin_right = 40.0
margin_bottom = 14.0
rect_scale = Vector2( 0.15, 0.15 )
-[node name="Timer Label" type="Label" parent="."]
+[node name="TimerLabel" type="Label" parent="."]
margin_top = 2.0
margin_right = 40.0
margin_bottom = 16.0
rect_scale = Vector2( 0.15, 0.15 )
-[node name="Timer" type="Timer" parent="Timer Label"]
+[node name="Timer" type="Timer" parent="TimerLabel"]
wait_time = 30.0
one_shot = true
diff --git a/scripts/interface.gd b/scripts/interface.gd
index f4b728d..c58411d 100644
--- a/scripts/interface.gd
+++ b/scripts/interface.gd
@@ -1,24 +1,20 @@
extends Control
-onready var timer_label = $"Timer Label"
-onready var timer = $"Timer Label/Timer"
-onready var score_label = $"Score Label"
-
func _ready():
- score_label.text = "Score: " + str(global_variables.score)
- timer.start()
- timer_label.text = "Time: " + str(timer.time_left)
+ $ScoreLabel.text = "Score: " + str(global_variables.score)
+ $TimerLabel/Timer.start()
+ $TimerLabel.text = "Time: " + str($TimerLabel/Timer.time_left)
$"Update Timer".start()
func _on_Hoop_score():
- if timer.get_time_left() > 0:
+ if $TimerLabel/Timer.get_time_left() > 0:
global_variables.score += 1
- score_label.text = "Score: " + str(global_variables.score)
- timer.start(timer.get_time_left() + 10)
+ $ScoreLabel.text = "Score: " + str(global_variables.score)
+ $TimerLabel/Timer.start($TimerLabel/Timer.get_time_left() + 10)
update_timer()
func update_timer():
- timer_label.text = "Time: " + str(round(timer.time_left))
+ $TimerLabel.text = "Time: " + str(round($TimerLabel/Timer.time_left))
func _on_Update_Timer_timeout():
update_timer()