mirror of
https://github.com/deunix-educ/aventuriers-des-mots.git
synced 2026-10-13 10:21:58 +02:00
Add the playable scene loop: boot through mission to reward
Wires every autoload up to a real UI: boot -> profile select/create -> world map (three mission markers, positioned from data, not hardcoded pixels) -> mission intro (narrative from data/missions/, a new data type with its own schema) -> rule panel -> exercise host -> one of the three exercise type scenes -> feedback panel -> reward screen -> back to the map. exercise_host is the only piece with real orchestration logic: picks exercises via ExerciseEngine (now fully implemented, validating at load like make validate-data does), validates answers through the pure AnswerValidator/DictationAnalyzer, escalates aid over 3 attempts via AttemptFlow, feeds DifficultyManager so adaptive difficulty is actually wired in rather than dead code, and records every attempt through ProgressManager. Every exercise-type scene (multiple_choice, sentence_correction, dictation) only emits its answer by signal, per the architecture invariant. All child-facing text now comes from data/localization/fr.json via UIText, not hardcoded in scripts or scenes. Getting that right required extending SchemaValidator to support "additionalProperties" as a schema (dynamic keys), which also closed a real gap: save.skills was previously unvalidated against SkillState's actual shape. 16 new headless tests, including two integration tests that instance exercise_host.tscn directly and drive it by emitting child-scene signals, stopping short of the final scene transition (which would tear down the test runner's own tree). Everything that needs a screen -- layout at different sizes, touch, virtual keyboard, actual audio playback (no .ogg files exist yet) -- is listed in the new docs/testing/manual-checklist.md instead of claimed as verified. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
extends Control
|
||||
## Panneau de retour : affiche le resultat d'une tentative (CorrectionResult).
|
||||
## Reussite et erreur se distinguent par le texte du titre, jamais par la
|
||||
## seule couleur (cahier des charges §11). Instancie par exercise_host.
|
||||
|
||||
signal continue_pressed
|
||||
|
||||
@onready var _title_label: Label = %TitleLabel
|
||||
@onready var _hint_box: VBoxContainer = %HintBox
|
||||
@onready var _hint_label: Label = %HintLabel
|
||||
@onready var _explanation_box: VBoxContainer = %ExplanationBox
|
||||
@onready var _explanation_label: Label = %ExplanationLabel
|
||||
@onready var _correction_box: VBoxContainer = %CorrectionBox
|
||||
@onready var _correction_label: Label = %CorrectionLabel
|
||||
@onready var _continue_button: Button = %ContinueButton
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
_continue_button.text = UIText.get_text("exercise_host.continue_button")
|
||||
_continue_button.pressed.connect(_on_continue_pressed)
|
||||
|
||||
|
||||
func show_result(result: CorrectionResult, support_level: AttemptFlow.SupportLevel) -> void:
|
||||
_title_label.text = (
|
||||
UIText.get_text("feedback_panel.correct_title")
|
||||
if result.is_correct
|
||||
else UIText.get_text("feedback_panel.incorrect_title")
|
||||
)
|
||||
|
||||
var show_hint := not result.is_correct and support_level == AttemptFlow.SupportLevel.HINT
|
||||
var show_explanation := (
|
||||
result.is_correct or support_level != AttemptFlow.SupportLevel.HINT
|
||||
)
|
||||
var show_correction := (
|
||||
not result.is_correct and support_level == AttemptFlow.SupportLevel.REVEAL
|
||||
)
|
||||
|
||||
_hint_box.visible = show_hint
|
||||
_hint_label.text = "%s %s" % [UIText.get_text("feedback_panel.hint_label"), result.hint]
|
||||
|
||||
_explanation_box.visible = show_explanation
|
||||
_explanation_label.text = "%s %s" % [
|
||||
UIText.get_text("feedback_panel.explanation_label"), result.explanation
|
||||
]
|
||||
|
||||
_correction_box.visible = show_correction
|
||||
_correction_label.text = "%s %s" % [
|
||||
UIText.get_text("feedback_panel.correction_label"), ", ".join(result.remediation)
|
||||
]
|
||||
|
||||
|
||||
func _on_continue_pressed() -> void:
|
||||
continue_pressed.emit()
|
||||
@@ -0,0 +1 @@
|
||||
uid://j44owty381sk
|
||||
@@ -0,0 +1,82 @@
|
||||
[gd_scene load_steps=2 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/ui/feedback_panel.gd" id="1"]
|
||||
|
||||
[node name="FeedbackPanel" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 1
|
||||
script = ExtResource("1")
|
||||
|
||||
[node name="Backdrop" type="ColorRect" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
color = Color(0, 0, 0, 0.5)
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="Panel" type="PanelContainer" parent="CenterContainer"]
|
||||
layout_mode = 2
|
||||
custom_minimum_size = Vector2(480, 0)
|
||||
|
||||
[node name="Margin" type="MarginContainer" parent="CenterContainer/Panel"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/margin_left = 24
|
||||
theme_override_constants/margin_top = 24
|
||||
theme_override_constants/margin_right = 24
|
||||
theme_override_constants/margin_bottom = 24
|
||||
|
||||
[node name="VBox" type="VBoxContainer" parent="CenterContainer/Panel/Margin"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/separation = 12
|
||||
|
||||
[node name="TitleLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 28
|
||||
|
||||
[node name="HintBox" type="VBoxContainer" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
|
||||
[node name="HintLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox/HintBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
autowrap_mode = 2
|
||||
|
||||
[node name="ExplanationBox" type="VBoxContainer" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
|
||||
[node name="ExplanationLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox/ExplanationBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
autowrap_mode = 2
|
||||
|
||||
[node name="CorrectionBox" type="VBoxContainer" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
|
||||
[node name="CorrectionLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox/CorrectionBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
autowrap_mode = 2
|
||||
|
||||
[node name="ContinueButton" type="Button" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
custom_minimum_size = Vector2(0, 56)
|
||||
@@ -0,0 +1,28 @@
|
||||
extends Control
|
||||
## Ecran de recompense : une mission terminee rapporte toujours la meme
|
||||
## recompense, que l'enfant ait eu besoin d'aide ou non (cahier des charges
|
||||
## §2, principe 6 : pas de recompense liee a la vitesse ou a la performance).
|
||||
## Sauvegarde groupee ici, en fin de mission (docs/specs/decisions.md point 7).
|
||||
|
||||
const STARS_PER_MISSION := 1
|
||||
|
||||
@onready var _title_label: Label = %TitleLabel
|
||||
@onready var _stars_label: Label = %StarsLabel
|
||||
@onready var _continue_button: Button = %ContinueButton
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
ProgressManager.add_stars(STARS_PER_MISSION)
|
||||
ProgressManager.save_now()
|
||||
|
||||
_title_label.text = UIText.get_text("reward_screen.title")
|
||||
_stars_label.text = "%s %d" % [
|
||||
UIText.get_text("reward_screen.stars_label"), ProgressManager.stars()
|
||||
]
|
||||
_continue_button.text = UIText.get_text("reward_screen.continue_button")
|
||||
_continue_button.pressed.connect(_on_continue_pressed)
|
||||
|
||||
|
||||
func _on_continue_pressed() -> void:
|
||||
GameManager.pending_mission_id = ""
|
||||
GameManager.goto(GameManager.SCENE_WORLD_MAP)
|
||||
@@ -0,0 +1 @@
|
||||
uid://hst702e112g7
|
||||
@@ -0,0 +1,40 @@
|
||||
[gd_scene load_steps=2 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/ui/reward_screen.gd" id="1"]
|
||||
|
||||
[node name="RewardScreen" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
script = ExtResource("1")
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="VBox" type="VBoxContainer" parent="CenterContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/separation = 20
|
||||
|
||||
[node name="TitleLabel" type="Label" parent="CenterContainer/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 36
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="StarsLabel" type="Label" parent="CenterContainer/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
horizontal_alignment = 1
|
||||
|
||||
[node name="ContinueButton" type="Button" parent="CenterContainer/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
custom_minimum_size = Vector2(200, 56)
|
||||
@@ -0,0 +1,29 @@
|
||||
extends Control
|
||||
## Panneau de regle : affiche l'enonce et l'exemple issus de data/rules/
|
||||
## (cycle d'apprentissage §2, etape "Decouvrir la regle"). Instancie par
|
||||
## exercise_host, qui ecoute le signal `continued` pour lancer le premier
|
||||
## exercice.
|
||||
|
||||
signal continued
|
||||
|
||||
@onready var _title_label: Label = %TitleLabel
|
||||
@onready var _statement_label: Label = %StatementLabel
|
||||
@onready var _example_label: Label = %ExampleLabel
|
||||
@onready var _continue_button: Button = %ContinueButton
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
_title_label.text = UIText.get_text("rule_panel.title")
|
||||
_continue_button.text = UIText.get_text("rule_panel.continue_button")
|
||||
_continue_button.pressed.connect(_on_continue_pressed)
|
||||
|
||||
|
||||
func show_rule(rule: Dictionary) -> void:
|
||||
_statement_label.text = rule.get("statement", "")
|
||||
_example_label.text = "%s %s" % [
|
||||
UIText.get_text("rule_panel.example_label"), rule.get("example", "")
|
||||
]
|
||||
|
||||
|
||||
func _on_continue_pressed() -> void:
|
||||
continued.emit()
|
||||
@@ -0,0 +1 @@
|
||||
uid://calghe6tbv2gj
|
||||
@@ -0,0 +1,65 @@
|
||||
[gd_scene load_steps=2 format=3]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/ui/rule_panel.gd" id="1"]
|
||||
|
||||
[node name="RulePanel" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 1
|
||||
script = ExtResource("1")
|
||||
|
||||
[node name="Backdrop" type="ColorRect" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
color = Color(0, 0, 0, 0.5)
|
||||
|
||||
[node name="CenterContainer" type="CenterContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="Panel" type="PanelContainer" parent="CenterContainer"]
|
||||
layout_mode = 2
|
||||
custom_minimum_size = Vector2(480, 0)
|
||||
|
||||
[node name="Margin" type="MarginContainer" parent="CenterContainer/Panel"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/margin_left = 24
|
||||
theme_override_constants/margin_top = 24
|
||||
theme_override_constants/margin_right = 24
|
||||
theme_override_constants/margin_bottom = 24
|
||||
|
||||
[node name="VBox" type="VBoxContainer" parent="CenterContainer/Panel/Margin"]
|
||||
layout_mode = 2
|
||||
theme_override_constants/separation = 16
|
||||
|
||||
[node name="TitleLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 28
|
||||
|
||||
[node name="StatementLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
autowrap_mode = 2
|
||||
|
||||
[node name="ExampleLabel" type="Label" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
autowrap_mode = 2
|
||||
|
||||
[node name="ContinueButton" type="Button" parent="CenterContainer/Panel/Margin/VBox"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
custom_minimum_size = Vector2(0, 56)
|
||||
Reference in New Issue
Block a user