From 2b74499051b8046670c16360ce6d7f5a683dc698 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Thu, 6 May 2021 11:15:54 +0200 Subject: [PATCH] make pickups spawn randomly --- mini-game/scenes/spawner/spawner.gd | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/mini-game/scenes/spawner/spawner.gd b/mini-game/scenes/spawner/spawner.gd index 9c5f760..277659f 100644 --- a/mini-game/scenes/spawner/spawner.gd +++ b/mini-game/scenes/spawner/spawner.gd @@ -3,10 +3,11 @@ extends Node2D export (Array,PackedScene) var scenes var random_scene = RandomNumberGenerator.new() +var random_timer = RandomNumberGenerator.new() var scene_index = 0; var last_object var end_of_game = false -var timer_speed = 0.99 +var timer_speed : float = 1 var random_threshold = 50 var scenes_offset = 0 var speed_offset : float = 0 setget set_speed_offset @@ -14,8 +15,10 @@ var speed_offset : float = 0 setget set_speed_offset onready var timer := $Timer onready var items := $items +var last_timer_random : float = 1 func init(speed: float): + update_timer() set_speed_offset(speed) @@ -36,20 +39,28 @@ func _on_Timer_timeout(): tmp.speed_offset = speed_offset items.add_child(tmp) last_object = tmp - if(timer.wait_time <= 1): - timer.wait_time = 1 + update_timer() + + +func update_timer(): + random_timer.randomize() + var random + if last_timer_random < -0.5: + random = random_scene.randf_range(-0.4, 1.5) else: - timer.wait_time *= timer_speed + random = random_scene.randf_range(-0.8, 1.5) + last_timer_random = random + timer.wait_time = timer_speed + random func start(difficulty, version): match difficulty: "easy": - timer_speed = 0.99 - random_threshold = 50 + timer_speed = 1 + random_threshold = 40 "hard": - timer_speed = 0.95 - random_threshold = 33 + timer_speed = 0.9 + random_threshold = 25 _: pass scenes_offset = version