From 44e8d7c60e5d4484722bcb3f27021145b4035c43 Mon Sep 17 00:00:00 2001 From: baldas_h Date: Sun, 5 Apr 2020 19:05:05 +0200 Subject: [PATCH] [EDIT] bug fix and final push --- Scene/GameMap.tscn | 4 ++-- Scene/Player.tscn | 2 +- Scene/SlowTrail.tscn | 1 + Scripts/GameManager.gd | 15 ++++++++++++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Scene/GameMap.tscn b/Scene/GameMap.tscn index 9dd28db..6785ab6 100644 --- a/Scene/GameMap.tscn +++ b/Scene/GameMap.tscn @@ -68,11 +68,11 @@ margin_left = 1300.0 margin_right = 1300.0 [node name="Player1" parent="." instance=ExtResource( 2 )] -position = Vector2( 292.436, 346.549 ) +position = Vector2( 1610.2, 283.082 ) z_index = 10 [node name="Player2" parent="." instance=ExtResource( 2 )] -position = Vector2( 1604.59, 344.539 ) +position = Vector2( 291.832, 282.743 ) z_index = 10 [node name="GameManager" parent="." instance=ExtResource( 5 )] diff --git a/Scene/Player.tscn b/Scene/Player.tscn index a660daa..c88c678 100644 --- a/Scene/Player.tscn +++ b/Scene/Player.tscn @@ -211,7 +211,7 @@ _data = { } [node name="KinematicBody2D" type="KinematicBody2D" groups=[ -"Player", +"player", ]] script = ExtResource( 2 ) slow_cooldown = 3 diff --git a/Scene/SlowTrail.tscn b/Scene/SlowTrail.tscn index adf313b..425bfe1 100644 --- a/Scene/SlowTrail.tscn +++ b/Scene/SlowTrail.tscn @@ -9,6 +9,7 @@ extents = Vector2( 88.8117, 26.2111 ) [node name="SlowTrail" type="Node2D"] +scale = Vector2( 2, 1 ) script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/Scripts/GameManager.gd b/Scripts/GameManager.gd index 206eeb9..a4db46f 100644 --- a/Scripts/GameManager.gd +++ b/Scripts/GameManager.gd @@ -1,14 +1,27 @@ extends Node2D onready var spawnPoints = get_tree().get_nodes_in_group("spawn_point") +onready var tmpSpawnPoints = get_tree().get_nodes_in_group("spawn_point") +var prevSpawnPoint = null var bucket = load("res://Scene/Clopinette.tscn") +func _ready(): + tmpSpawnPoints.shuffle() + func spawnBucket(): var newBucket = bucket.instance() + + if tmpSpawnPoints.size() == 0: + tmpSpawnPoints = [] + spawnPoints + tmpSpawnPoints.shuffle() + + var newSpawnPoint = tmpSpawnPoints[randi() % tmpSpawnPoints.size()] + self.get_parent().add_child(newBucket) newBucket.add_to_group("bucket") - newBucket.set_position(spawnPoints[randi() % spawnPoints.size()].get_position()) + newBucket.set_position(newSpawnPoint.get_position()) + tmpSpawnPoints.erase(newSpawnPoint) func _process(_delta): if get_tree().get_nodes_in_group("bucket").empty():