From e7fc1e9fa7ccb7cf1f35867fc3de149e02a558c9 Mon Sep 17 00:00:00 2001 From: baldas_h Date: Sun, 5 Apr 2020 10:19:45 +0200 Subject: [PATCH 1/2] [FIX] removed some warnings and buckets have sprites now --- Scripts/GameManager.gd | 9 +-------- Scripts/PaintEffects/Slippery.gd | 3 --- Scripts/Player.gd | 1 - Scripts/TitleScreen.gd | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Scripts/GameManager.gd b/Scripts/GameManager.gd index a631a8e..206eeb9 100644 --- a/Scripts/GameManager.gd +++ b/Scripts/GameManager.gd @@ -4,20 +4,13 @@ onready var spawnPoints = get_tree().get_nodes_in_group("spawn_point") var bucket = load("res://Scene/Clopinette.tscn") -var scripts = ["res://Scripts/PaintEffects/ConfuseDirections.gd", -"res://Scripts/PaintEffects/Downscale.gd", -"res://Scripts/PaintEffects/Invisibility.gd", -"res://Scripts/PaintEffects/Slippery.gd", -"res://Scripts/PaintEffects/Upscale.gd"] - func spawnBucket(): var newBucket = bucket.instance() - newBucket.scriptName = scripts[randi() % scripts.size()] self.get_parent().add_child(newBucket) newBucket.add_to_group("bucket") newBucket.set_position(spawnPoints[randi() % spawnPoints.size()].get_position()) -func _process(delta): +func _process(_delta): if get_tree().get_nodes_in_group("bucket").empty(): spawnBucket() diff --git a/Scripts/PaintEffects/Slippery.gd b/Scripts/PaintEffects/Slippery.gd index f173d84..9b9eb23 100644 --- a/Scripts/PaintEffects/Slippery.gd +++ b/Scripts/PaintEffects/Slippery.gd @@ -16,9 +16,6 @@ func SlipperyRoutine(player, delta): player.FRICTION /= FrictionFactor player.MAX_SPEED *= SpeedFactor - var sprite = player.get_node("Sprite") - var coll = player.get_node("CollisionShape2D") - while elapsed < SlipperyTime: elapsed += yield() diff --git a/Scripts/Player.gd b/Scripts/Player.gd index 012570f..3b734bf 100644 --- a/Scripts/Player.gd +++ b/Scripts/Player.gd @@ -65,7 +65,6 @@ func _physics_process(delta): func updatePaintEffects(delta): - var sprite = get_node("Sprite") var updated = [] for rout in coroutines: if rout != null && rout.is_valid(): diff --git a/Scripts/TitleScreen.gd b/Scripts/TitleScreen.gd index 8a9bad2..611ba4d 100644 --- a/Scripts/TitleScreen.gd +++ b/Scripts/TitleScreen.gd @@ -6,7 +6,7 @@ onready var quitGameButton = $Sprite/MarginContainer/HBoxContainer/QuitGameButto func _ready(): startGameButton.grab_focus() -func _process(delta): +func _process(_delta): if startGameButton.is_hovered(): startGameButton.grab_focus() elif quitGameButton.is_hovered(): From 2c99c7344dcb566c5d635bbbb619870b674892d6 Mon Sep 17 00:00:00 2001 From: baldas_h Date: Sun, 5 Apr 2020 10:48:07 +0200 Subject: [PATCH 2/2] [EDIT] fixed zindex --- Scene/Clopinette.tscn | 1 + Scene/TitleScreen.tscn | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Scene/Clopinette.tscn b/Scene/Clopinette.tscn index bc308d0..35624ad 100644 --- a/Scene/Clopinette.tscn +++ b/Scene/Clopinette.tscn @@ -8,6 +8,7 @@ position = Vector2( 458.947, 226.316 ) script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] +z_index = 3 texture = ExtResource( 2 ) [node name="Area2D" type="Area2D" parent="."] diff --git a/Scene/TitleScreen.tscn b/Scene/TitleScreen.tscn index c37b5cc..2a532d8 100644 --- a/Scene/TitleScreen.tscn +++ b/Scene/TitleScreen.tscn @@ -24,15 +24,16 @@ __meta__ = { } [node name="HBoxContainer" type="HBoxContainer" parent="Sprite/MarginContainer"] -margin_left = 674.0 -margin_top = 771.0 -margin_right = 902.0 +margin_left = 788.0 +margin_top = 835.0 +margin_right = 788.0 margin_bottom = 835.0 size_flags_horizontal = 4 size_flags_vertical = 12 custom_constants/separation = 100 [node name="StartGameButton" type="TextureButton" parent="Sprite/MarginContainer/HBoxContainer"] +visible = false margin_right = 64.0 margin_bottom = 64.0 size_flags_horizontal = 4 @@ -40,8 +41,8 @@ size_flags_vertical = 8 texture_normal = ExtResource( 3 ) [node name="QuitGameButton" type="TextureButton" parent="Sprite/MarginContainer/HBoxContainer"] -margin_left = 164.0 -margin_right = 228.0 +visible = false +margin_right = 64.0 margin_bottom = 64.0 texture_normal = ExtResource( 3 ) [connection signal="pressed" from="Sprite/MarginContainer/HBoxContainer/StartGameButton" to="." method="_on_StartGameButton_pressed"]