diff --git a/Assets/Resources/CateFin/3. Explication train 1.wav b/Assets/Resources/CateFin/3. Explication train 1.wav
new file mode 100644
index 0000000000000000000000000000000000000000..38e06d4a4260ab29fc6c2fa6515950ff52239b0f
Binary files /dev/null and b/Assets/Resources/CateFin/3. Explication train 1.wav differ
diff --git a/Assets/Resources/CateFin/3. Explication train 2.wav b/Assets/Resources/CateFin/3. Explication train 2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..9a370ecb40ca377b7fd470404b1e654b506d22bd
Binary files /dev/null and b/Assets/Resources/CateFin/3. Explication train 2.wav differ
diff --git a/Assets/Resources/one_for_all.json b/Assets/Resources/one_for_all.json
index 17907fa8eecb936857a00eac70241f0e65e6a679..4467a4f2611cf656cab5c9130e72cc5ff67ada4e 100644
--- a/Assets/Resources/one_for_all.json
+++ b/Assets/Resources/one_for_all.json
@@ -62,6 +62,9 @@
"C.2.Cns_Tt": {
"snd_path": "CateInit/2. consigne tuto"
},
+ "C.2.Cns_Tuto": {
+ "snd_path": "CateFin/2. Consigne tuto"
+ },
"C.2.Ct": {
"snd_path": "C.O/2. Ecoute"
},
@@ -6106,6 +6109,12 @@
"et": {
"snd_path": "General/et"
},
+ "expl_fir": {
+ "snd_path": "CateFin/3. Explication train 1"
+ },
+ "expl_rush": {
+ "snd_path": "CateFin/3. Explication train 2"
+ },
"eyto_f": {
"snd_path": "Inversion/EnF/En_F_ 210"
},
@@ -9497,7 +9506,7 @@
{
"id": "panou",
"type": "test",
- "consigne": "Panou_m",
+ "consigne": "Panou_f",
"fond": "M.M.Mnstr-3.0",
"randomiser": true,
"enumerer": true,
@@ -9530,7 +9539,7 @@
{
"id": "fura",
"type": "test",
- "consigne": "Fura_f",
+ "consigne": "Fura_m",
"fond": "M.M.Mnstr-1.3",
"randomiser": true,
"enumerer": true,
@@ -9563,7 +9572,7 @@
{
"id": "souton",
"type": "test",
- "consigne": "Souton_f",
+ "consigne": "Souton_m",
"fond": "M.M.Mnstr-4.2",
"randomiser": true,
"enumerer": true,
@@ -9596,7 +9605,7 @@
{
"id": "boofay",
"type": "test",
- "consigne": "Boofay_m",
+ "consigne": "Boofay_f",
"fond": "M.M.Mnstr-3.1",
"randomiser": true,
"enumerer": true,
@@ -9639,7 +9648,7 @@
{
"id": "toumelle",
"type": "test",
- "consigne": "Toumelle_m",
+ "consigne": "Toumelle_f",
"fond": "M.M.Mnstr-5.0",
"randomiser": true,
"enumerer": true,
@@ -9672,7 +9681,7 @@
{
"id": "gubagge",
"type": "test",
- "consigne": "Gubagge_m",
+ "consigne": "Gubagge_f",
"fond": "M.M.Mnstr-1.2",
"randomiser": true,
"enumerer": true,
@@ -9705,7 +9714,7 @@
{
"id": "louroze",
"type": "test",
- "consigne": "Louroze_f",
+ "consigne": "Louroze_m",
"fond": "M.M.Mnstr-2.1",
"randomiser": true,
"enumerer": true,
@@ -9738,7 +9747,7 @@
{
"id": "tritus",
"type": "test",
- "consigne": "Tritus_f",
+ "consigne": "Tritus_m",
"fond": "M.M.Mnstr-3.3",
"randomiser": true,
"enumerer": true,
@@ -9771,7 +9780,7 @@
{
"id": "crobice",
"type": "test",
- "consigne": "Crobice_m",
+ "consigne": "Crobice_f",
"fond": "M.M.Mnstr-4.0",
"randomiser": true,
"enumerer": true,
@@ -9804,7 +9813,7 @@
{
"id": "fanail",
"type": "test",
- "consigne": "Fanail_m",
+ "consigne": "Fanail_f",
"fond": "M.M.Mnstr-2.2",
"randomiser": true,
"enumerer": true,
@@ -9847,7 +9856,7 @@
{
"id": "voutade",
"type": "test",
- "consigne": "Voutade_f",
+ "consigne": "Voutade_m",
"fond": "M.M.Mnstr-5.3",
"randomiser": true,
"enumerer": true,
@@ -9880,7 +9889,7 @@
{
"id": "javitt",
"type": "test",
- "consigne": "Javitt_m",
+ "consigne": "Javitt_f",
"fond": "M.M.Mnstr-3.2",
"randomiser": true,
"enumerer": true,
@@ -9913,7 +9922,7 @@
{
"id": "nedac",
"type": "test",
- "consigne": "Nedac_f",
+ "consigne": "Nedac_m",
"fond": "M.M.Mnstr-1.1",
"randomiser": true,
"enumerer": true,
@@ -9946,7 +9955,7 @@
{
"id": "woomog",
"type": "test",
- "consigne": "Woomog_f",
+ "consigne": "Woomog_m",
"fond": "M.M.Mnstr-2.0",
"randomiser": true,
"enumerer": true,
@@ -9979,7 +9988,7 @@
{
"id": "chorube",
"type": "test",
- "consigne": "Chorube_m",
+ "consigne": "Chorube_f",
"fond": "M.M.Mnstr-5.2",
"randomiser": true,
"enumerer": true,
@@ -10012,7 +10021,7 @@
{
"id": "letard",
"type": "test",
- "consigne": "Letard_m",
+ "consigne": "Letard_f",
"fond": "M.M.Mnstr-4.3",
"randomiser": true,
"enumerer": true,
@@ -10108,7 +10117,7 @@
"type": "training",
"consigne": "C.Cns_",
"fond": "M.M.Mnstr-9.4",
- "randomiser": false,
+ "randomiser": true,
"enumerer": true,
"surligner": true,
"description": null,
@@ -10145,7 +10154,7 @@
"consigne": "C.Cns_",
"fond": "M.M.Mnstr-9.4",
"transition": "C.7.Trns°",
- "randomiser": false,
+ "randomiser": true,
"enumerer": true,
"surligner": true,
"description": null,
@@ -11436,12 +11445,12 @@
"id": "Tuto_CateFin",
"type": "tuto",
"pret": "ready",
- "consigne": "C.2.Cns_Tt",
+ "consigne": "C.2.Cns_Tuto",
"fond": "M.M.Mnstr-9.4",
"miseEnAction": "C.4.MsNC°",
"explication": "C.3.Xplc°",
"surlignerExplication": 1.05,
- "randomiser": false,
+ "randomiser": true,
"enumerer": true,
"surligner": true,
"description": null,
@@ -11451,21 +11460,24 @@
"image": "M.F.Fd-2.4",
"son": "C.F.Fr_f_274",
"description": null,
- "correct": true
+ "correct": true,
+ "feedback": "C.Fb+"
},
{
"id": "Lime_F",
"image": "M.F.Fd-4.0",
"son": "C.F.Fr_f_275",
"description": null,
- "correct": false
+ "correct": false,
+ "feedback": "C.Fb-"
},
{
"id": "Tame_F",
"image": "M.F.Fd-1.3",
"son": "C.F.Fr_f_276",
"description": null,
- "correct": false
+ "correct": false,
+ "feedback": "C.Fb-"
}
]
}
@@ -11484,7 +11496,9 @@
"type": "training",
"consigne": "C.Cns_Gnrl",
"fond": "M.M.Mnstr-9.4",
- "randomiser": false,
+ "explication": "expl_fir",
+ "surlignerExplication": 1.05,
+ "randomiser": true,
"enumerer": true,
"surligner": true,
"description": null,
@@ -11520,8 +11534,10 @@
"type": "training",
"consigne": "C.Cns_Gnrl",
"fond": "M.M.Mnstr-9.4",
+ "explication": "expl_rush",
+ "surlignerExplication": 1.05,
"transition": "C.5.Trns°",
- "randomiser": false,
+ "randomiser": true,
"enumerer": true,
"surligner": true,
"description": null,
@@ -11720,7 +11736,7 @@
},
{
"id": "Push_M",
- "image": "M.F.Fd-4.4",
+ "image": "M.F.Fd-4.0",
"son": "C.E.N_m_264",
"description": null,
"correct": false
@@ -11928,7 +11944,7 @@
},
{
"id": "Ovum_M",
- "image": "M.F.Fd-4.4",
+ "image": "M.F.Fd-15.4",
"son": "C.E.N_m_279",
"description": null,
"correct": false