diff --git a/project.godot b/project.godot index 6b37e0b4..8c283e4b 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Kalulu" config/version="0.0" run/main_scene="res://sources/menus/splash_screen/splash_screen.tscn" -config/features=PackedStringArray("4.2", "Forward Plus") +config/features=PackedStringArray("4.3", "Forward Plus") boot_splash/bg_color=Color(0.141176, 0.141176, 0.141176, 1) config/icon="res://icon.svg" custom/unlock_everything=false diff --git a/sources/minigames/fish/fish_minigame.gd b/sources/minigames/fish/fish_minigame.gd index d96b157a..dce5a0ad 100644 --- a/sources/minigames/fish/fish_minigame.gd +++ b/sources/minigames/fish/fish_minigame.gd @@ -22,6 +22,7 @@ const fish_texture_rect_scene: = preload("res://sources/minigames/fish/fish_text @export var game_duration: = 4 * 60 @export var minimum_correct_ratio: = 0.8 @export var winning_color: = Color.WHITE +@export var max_words_count: = 15 var tween: Tween var words_to_present: Array[String] = [] @@ -52,11 +53,14 @@ func _ready() -> void: func _find_stimuli_and_distractions() -> void: var data_array: = Database.get_pseudowords_for_lesson(lesson_nb) + data_array.shuffle() words_to_present.clear() words_to_present_next.clear() for data: Dictionary in data_array: stimuli.append(data.Word) distractions.append(data.Pseudoword) + if stimuli.size() >= max_words_count: + break for word: String in stimuli: words_to_present.append(word) for word: String in distractions: diff --git a/sources/minigames/fish/fish_minigame.tscn b/sources/minigames/fish/fish_minigame.tscn index 09f9e897..f394ff80 100644 --- a/sources/minigames/fish/fish_minigame.tscn +++ b/sources/minigames/fish/fish_minigame.tscn @@ -484,6 +484,7 @@ script = ExtResource("2_68jip") game_duration = 240 minimum_correct_ratio = 0.8 winning_color = Color(2.988, 2.328, 0.6, 1) +max_words_count = 15 minigame_name = "fish" lesson_nb = 50 @@ -629,7 +630,7 @@ sprites = [NodePath("FishAnimatedSprite")] [node name="FishAnimatedSprite" type="AnimatedSprite2D" parent="GameRoot/AspectRatioContainer/Fish" index="0"] unique_name_in_owner = true -scale = Vector2(1e-05, 1e-05) +scale = Vector2(2.20411, 2.2041) sprite_frames = SubResource("SpriteFrames_ukbiw") animation = &"idle" autoplay = "idle"