vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds speed difficulty to the frog minigame

Browse Source
This commit is contained in:
Dylan Sarrazyn
2024-04-16 16:26:52 +02:00
committed by BimDav
parent 1b5e5d4f1a
commit f82e66f716
5 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/minigames/frog/frog_minigame.gd
+9 -8
View File
@@ -6,22 +6,22 @@ const lilypad_track_scene: = preload("res://sources/minigames/frog/lilypad_track
class DifficultySettings:
var targetsPerLane: = 1
var stimuli_ratio: = 0.75
var padsSpeedDisabled: = 100.0
var padsSpeed: = 200.0
func _init(p_targetsPerLane: int, p_padsSpeedDisabled: float, p_padsSpeed: float) -> void:
targetsPerLane = p_targetsPerLane
func _init(p_stimuli_ratio: float, p_padsSpeedDisabled: float, p_padsSpeed: float) -> void:
stimuli_ratio = p_stimuli_ratio
padsSpeedDisabled = p_padsSpeedDisabled
padsSpeed = p_padsSpeed
var difficulty_settings: Array[DifficultySettings] = [
DifficultySettings.new(1, 100., 200.),
DifficultySettings.new(2, 150., 250.),
DifficultySettings.new(2, 200., 300.),
DifficultySettings.new(3, 250., 350.),
DifficultySettings.new(3, 300., 400.)
DifficultySettings.new(0.75, 100., 200.),
DifficultySettings.new(0.66, 150., 250.),
DifficultySettings.new(0.33, 200., 300.),
DifficultySettings.new(0.25, 250., 350.),
DifficultySettings.new(0.25, 300., 400.)
]
@@ -102,6 +102,7 @@ func _create_tracks() -> void:
track_stimuli.append(current_word.GPs[i])
track_stimuli.append_array(current_distractors[i])
track.stimuli = track_stimuli
track.difficulty_settings = difficulty_settings[difficulty]
var are_distractors: = []
are_distractors.append(false)
sources/minigames/frog/frog_minigame.tscn
+1 -1
View File
@@ -61,7 +61,7 @@ shader_parameter/y_offset = 0.0
script = ExtResource("2_0xg3r")
max_number_of_GPs = 6
lesson_nb = 12
difficulty = 1
difficulty = 4
max_number_of_lives = 5
max_progression = 3
sources/minigames/frog/lilypad.gd
+5
View File
@@ -64,3 +64,8 @@ func _on_animation_player_animation_finished(anim_name: StringName) -> void:
func _on_texture_button_pressed() -> void:
pressed.emit()
func _on_visible_on_screen_notifier_2d_screen_exited():
#await get_tree().create_timer(3).timeout
disappear()
sources/minigames/frog/lilypad.tscn
+3
View File
@@ -94,5 +94,8 @@ vertical_alignment = 1
[node name="WrongFX" parent="." instance=ExtResource("7_241b6")]
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"]
[connection signal="pressed" from="TextureButton" to="." method="_on_texture_button_pressed"]
[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"]
sources/minigames/frog/lilypad_track.gd
+35 -34
View File
@@ -4,24 +4,25 @@ class_name LilypadTrack
signal lilypad_in_center(lilypad: Lilypad)
const lilypad_class: = preload("res://sources/minigames/frog/lilypad.tscn")
const lilypad_crossing_time: = 5.0
@onready var audio_player: = $AudioStreamPlayer2D
@onready var spawn_timer: = $SpawnTimer
const lilypad_class: = preload("res://sources/minigames/frog/lilypad.tscn")
const number_of_lilypads: = 25
const lilypad_crossing_time: = 5.0
var ready_to_spawn: = false
var is_cleared: = false
var is_enabled: = false:
set = _set_enabled
var is_highlighting: = false:
set = _set_highlighting
var ready_to_spawn: = false
var top_to_bottom: = true
var lilypads: Array[Lilypad] = []
var tweens: Array[Tween] = []
var stimuli: = []:
set = _set_stimuli
@@ -30,14 +31,31 @@ var are_distractors: = []
var stimuli_queue: = []
var stimuli_queue_size: = 0
var difficulty_settings: FrogMinigame.DifficultySettings
var lilypad_size: Vector2
var is_stopped: bool = false
func _process(delta):
if is_stopped:
return
for lilypad: Lilypad in lilypads:
if top_to_bottom:
lilypad.position.y += _get_velocity() * delta
else:
lilypad.position.y -= _get_velocity() * delta
func _get_velocity() -> float:
if is_enabled:
return difficulty_settings.padsSpeed
return difficulty_settings.padsSpeedDisabled
func reset() -> void:
is_cleared = false
ready_to_spawn = false
is_enabled = false
for tween in tweens:
tween.stop()
is_stopped = true
for lilypad: Lilypad in lilypads:
lilypad.disappear()
@@ -47,10 +65,12 @@ func reset() -> void:
func start() -> void:
ready_to_spawn = true
is_stopped = false
func stop() -> void:
ready_to_spawn = false
is_stopped = true
func right() -> void:
@@ -75,7 +95,7 @@ func _spawn_lilypad() -> void:
end_point = global_position + Vector2(size.x / 2.0, size.y)
lilypad.global_position = start_point
var lilypad_size: Vector2 = lilypad.get_real_size()
lilypad_size = lilypad.get_real_size()
if size.x < lilypad_size.x:
var s: float = size.x / lilypad_size.x
lilypad.scale = Vector2(s, s)
@@ -99,12 +119,6 @@ func _spawn_lilypad() -> void:
stimuli_queue.append(potential_stimuli[i])
if stimuli_queue.size() > stimuli_queue_size:
stimuli_queue.pop_front()
var tween: = create_tween()
tween.finished.connect(_on_tween_finished.bind(lilypad, tween))
tween.tween_property(lilypad, "global_position", end_point, lilypad_crossing_time)
tweens.append(tween)
func _despawn_lilypad(lilypad: Lilypad) -> void:
@@ -135,12 +149,7 @@ func _set_stimuli(value: Array) -> void:
func _on_lilypad_pressed(lilypad: Lilypad) -> void:
audio_player.play()
ready_to_spawn = false
for tween in tweens:
tween.kill()
tweens = []
stop()
for other_lilypad in lilypads:
if other_lilypad != lilypad:
@@ -148,32 +157,24 @@ func _on_lilypad_pressed(lilypad: Lilypad) -> void:
var center_tween: = create_tween()
center_tween.finished.connect(_on_center_tween_finished.bind(lilypad, center_tween))
center_tween.tween_property(lilypad, "global_position", global_position + size / 2.0, 0.5)
tweens.append(center_tween)
func _on_lilypad_disappeared(lilypad: Lilypad) -> void:
_despawn_lilypad(lilypad)
func _on_tween_finished(lilypad: Lilypad, tween: Tween) -> void:
lilypad.disappear()
tweens.erase(tween)
tween.kill()
func _on_center_tween_finished(lilypad: Lilypad, center_tween: Tween) -> void:
lilypad_in_center.emit(lilypad)
center_tween.kill()
tweens.erase(center_tween)
func _on_spawn_timer_timeout() -> void:
if ready_to_spawn:
_spawn_lilypad()
spawn_timer.start(randf_range(0.75, 1.5))
# Makes sure the lilypads don't overlap
if lilypad_size:
spawn_timer.start(randf_range(lilypad_size.y / _get_velocity(), lilypad_size.y * 2 / _get_velocity()))
else:
spawn_timer.start(randf_range(0.75, 1.5))