diff options
| author | Logan <logan@cflip.net> | 2022-09-30 19:12:03 -0600 |
|---|---|---|
| committer | Logan <logan@cflip.net> | 2022-09-30 19:12:03 -0600 |
| commit | 041052d87e9181d0b3108057af26d9ae1cd6913f (patch) | |
| tree | 2e720b5c09fc4c30133134001419bc40c760cb65 | |
| parent | 181f0aa422df02c14c9a4be9b59835661b3c5c07 (diff) | |
Removed the need for two timers and cleaned up some stuff.
| -rw-r--r-- | project.godot | 2 | ||||
| -rw-r--r-- | scenes/interface.tscn | 28 | ||||
| -rw-r--r-- | scripts/interface.gd | 17 | ||||
| -rw-r--r-- | theme_data/font.tres | 6 | ||||
| -rw-r--r-- | theme_data/interface.theme | bin | 333 -> 0 bytes |
5 files changed, 29 insertions, 24 deletions
diff --git a/project.godot b/project.godot index b6a58c1..fb0c0b3 100644 --- a/project.godot +++ b/project.godot @@ -30,7 +30,7 @@ window/stretch/aspect="keep" [gui] common/drop_mouse_on_gui_input_disabled=true -theme/custom="res://theme_data/interface.theme" +theme/custom_font="res://theme_data/font.tres" [importer_defaults] diff --git a/scenes/interface.tscn b/scenes/interface.tscn index f65b814..8b37f8f 100644 --- a/scenes/interface.tscn +++ b/scenes/interface.tscn @@ -1,26 +1,24 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://theme_data/interface.theme" type="Theme" id=1] [ext_resource path="res://scripts/interface.gd" type="Script" id=3] [node name="Interface" type="CanvasLayer"] script = ExtResource( 3 ) [node name="ScoreLabel" type="Label" parent="."] -margin_right = 40.0 -margin_bottom = 11.0 -theme = ExtResource( 1 ) +margin_top = -2.0 +margin_right = 48.0 +margin_bottom = 14.0 +rect_scale = Vector2( 0.8, 0.8 ) +text = "Score:" [node name="TimerLabel" type="Label" parent="."] -margin_top = 10.0 -margin_right = 40.0 -margin_bottom = 26.0 -theme = ExtResource( 1 ) +margin_top = 11.0 +margin_right = 56.0 +margin_bottom = 27.0 +rect_scale = Vector2( 0.8, 0.8 ) +text = "Timer: " -[node name="Timer" type="Timer" parent="TimerLabel"] -wait_time = 30.0 -one_shot = true +[node name="Timer" type="Timer" parent="."] -[node name="Update Timer" type="Timer" parent="."] - -[connection signal="timeout" from="Update Timer" to="." method="_on_Update_Timer_timeout"] +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/scripts/interface.gd b/scripts/interface.gd index 96bbff4..8aff53b 100644 --- a/scripts/interface.gd +++ b/scripts/interface.gd @@ -1,20 +1,21 @@ extends CanvasLayer +var time_left = 30 + func _ready(): $ScoreLabel.text = "Score: " + str(global_variables.score) - $TimerLabel/Timer.start() - $TimerLabel.text = "Time: " + str($TimerLabel/Timer.time_left) - $"Update Timer".start() + $TimerLabel.text = "Time: " + str(time_left) + $Timer.start() func _on_Hoop_score(): - if $TimerLabel/Timer.get_time_left() > 0: - global_variables.score += 1 + if time_left > 0: $ScoreLabel.text = "Score: " + str(global_variables.score) - $TimerLabel/Timer.start($TimerLabel/Timer.get_time_left() + 10) + time_left += 10 update_timer() func update_timer(): - $TimerLabel.text = "Time: " + str(round($TimerLabel/Timer.time_left)) + $TimerLabel.text = "Time: " + str(time_left) -func _on_Update_Timer_timeout(): +func _on_Timer_timeout(): + time_left -= 1 update_timer() diff --git a/theme_data/font.tres b/theme_data/font.tres new file mode 100644 index 0000000..d7a2d55 --- /dev/null +++ b/theme_data/font.tres @@ -0,0 +1,6 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://theme_data/FSEX302.ttf" type="DynamicFontData" id=1] + +[resource] +font_data = ExtResource( 1 ) diff --git a/theme_data/interface.theme b/theme_data/interface.theme Binary files differdeleted file mode 100644 index f8b81bf..0000000 --- a/theme_data/interface.theme +++ /dev/null |