diff options
| -rw-r--r-- | project.godot | 4 | ||||
| -rw-r--r-- | scenes/level.tscn | 1 | ||||
| -rw-r--r-- | scripts/basketball.gd | 13 | ||||
| -rw-r--r-- | scripts/global_variables.gd | 3 | ||||
| -rw-r--r-- | scripts/hoop.gd | 1 | ||||
| -rw-r--r-- | scripts/interface.gd | 10 |
6 files changed, 22 insertions, 10 deletions
diff --git a/project.godot b/project.godot index bd10976..43deae4 100644 --- a/project.godot +++ b/project.godot @@ -14,6 +14,10 @@ config/name="BasketBALLAZ" run/main_scene="res://scenes/level.tscn" config/icon="res://icon.png" +[autoload] + +global_variables="*res://scripts/global_variables.gd" + [gui] common/drop_mouse_on_gui_input_disabled=true diff --git a/scenes/level.tscn b/scenes/level.tscn index bea53bc..fe471cd 100644 --- a/scenes/level.tscn +++ b/scenes/level.tscn @@ -33,3 +33,4 @@ texture = ExtResource( 1 ) shape = SubResource( 1 ) [connection signal="score" from="Hoop" to="Interface" method="_on_Hoop_score"] +[connection signal="change_power" from="Basketball" to="Interface" method="_on_Basketball_change_power"] diff --git a/scripts/basketball.gd b/scripts/basketball.gd index ca7745d..d88d815 100644 --- a/scripts/basketball.gd +++ b/scripts/basketball.gd @@ -1,5 +1,7 @@ extends RigidBody2D +signal change_power + var start_position var do_reset = true var is_reset = true @@ -20,15 +22,16 @@ func _integrate_forces(state): do_reset = false is_reset = true -func _process(_delta): +# Temporary controls to adjust power +func _process(delta): if Input.is_action_pressed("ui_up"): if power < 200: - power += 1 - print(power) + power += 0.5 + emit_signal("change_power", power) if Input.is_action_pressed("ui_down"): if power > 10: - power -= 1 - print(power) + power -= 0.5 + emit_signal("change_power", power) func _input(event): if event.is_action_pressed("shoot"): diff --git a/scripts/global_variables.gd b/scripts/global_variables.gd new file mode 100644 index 0000000..b570635 --- /dev/null +++ b/scripts/global_variables.gd @@ -0,0 +1,3 @@ +extends Node + +var score = 0 diff --git a/scripts/hoop.gd b/scripts/hoop.gd index 0ff820a..94b3069 100644 --- a/scripts/hoop.gd +++ b/scripts/hoop.gd @@ -3,4 +3,5 @@ extends StaticBody2D signal score func _on_Area2D_body_exited(_body): + global_variables.score += 1 emit_signal ("score") diff --git a/scripts/interface.gd b/scripts/interface.gd index 08ee85d..4f2c8b1 100644 --- a/scripts/interface.gd +++ b/scripts/interface.gd @@ -1,10 +1,10 @@ extends Label -var score = 0 - func _ready(): - text = "Score: " + str(score) + text = "Score: " + str(global_variables.score) func _on_Hoop_score(): - score += 1 - text = "Score: " + str(score) + text = "Score: " + str(global_variables.score) + +func _on_Basketball_change_power(power): + text = "Power: " + str(power) |