diff --git a/scenes/vague.gd b/scenes/vague.gd index 34d35b0..c7778d6 100644 --- a/scenes/vague.gd +++ b/scenes/vague.gd @@ -23,10 +23,10 @@ Vague.new(1, 2, 0), Vague.new(2, 2, 1), Vague.new(2, 3, 1), Vague.new(3, 3, 2), -Vague.new(3, 4, 2), -Vague.new(4, 4, 3), -Vague.new(4, 5, 3), -Vague.new(5, 5, 4), +Vague.new(3, 1, 2), +Vague.new(1, 4, 3), +Vague.new(2, 2, 3), +Vague.new(1, 5, 2), Vague.new(2, 3, 2), Vague.new(3, 2, 1), Vague.new(1, 4, 3), @@ -85,7 +85,7 @@ func _on_timer_timeout(): print("t") instancier_ennemis(vagues[vague_actuelle]) vague_actuelle = (vague_actuelle + 1) % len(vagues) - $Timer.set_wait_time(10) + $Timer.set_wait_time(30) $Timer.start() else: print("All waves cleared!") diff --git a/scripts/player_control.gd b/scripts/player_control.gd index 354fafe..3018236 100644 --- a/scripts/player_control.gd +++ b/scripts/player_control.gd @@ -21,8 +21,10 @@ var flute_cooldown = 0.5 var tambour_cooldown = 3.0 var lyre_cooldown = 1 -var slot = [] -var slotstr = [] +var instrument_list = [ + "", + "" +] var vie = 10 @@ -103,7 +105,7 @@ func _process(delta: float) -> void: lyre.jouer_melodie(position, direction_balle, angle_lyre) lyre_timer = lyre_cooldown - + func take_damage(dmg : int) : vie -= dmg interface.set_life(vie)