diff --git a/src/activities/memory-enumerate/resource/1/Data.qml b/src/activities/memory-enumerate/resource/1/Data.qml --- a/src/activities/memory-enumerate/resource/1/Data.qml +++ b/src/activities/memory-enumerate/resource/1/Data.qml @@ -29,24 +29,16 @@ property string url: "qrc:/gcompris/src/activities/memory-enumerate/resource/" property var texts: [ - ["", 1], - ["", 2], ["", 1], ["", 2] ] property var images: [ [url + 'math_1.svg', ''], [url + 'math_2.svg', ''], - [url + 'math_1.svg', ''], - [url + 'math_2.svg', ''] ] property var sounds: [ - ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], - ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], ["", @@ -57,9 +49,9 @@ { // Level 1 "columns": 2, "rows": 2, - "texts": texts.slice(0, 4), - "images": images.slice(0, 4), - "sounds": sounds.slice(0, 4) + "texts": texts.slice(0, 2), + "images": images.slice(0, 2), + "sounds": sounds.slice(0, 2) } ] } diff --git a/src/activities/memory-enumerate/resource/2/Data.qml b/src/activities/memory-enumerate/resource/2/Data.qml --- a/src/activities/memory-enumerate/resource/2/Data.qml +++ b/src/activities/memory-enumerate/resource/2/Data.qml @@ -31,32 +31,28 @@ property var texts: [ ["", 1], ["", 2], - ["", 2], ["", 3] ] property var images: [ [url + 'math_1.svg', ''], [url + 'math_2.svg', ''], - [url + 'math_2.svg', ''], [url + 'math_3.svg', ''] ] property var sounds: [ ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], - ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0033.$CA")] ] data: [ { // Level 1 - "columns": 2, + "columns": 3, "rows": 2, "texts": texts.slice(0, 4), "images": images.slice(0, 4), diff --git a/src/activities/memory-enumerate/resource/3/Data.qml b/src/activities/memory-enumerate/resource/3/Data.qml --- a/src/activities/memory-enumerate/resource/3/Data.qml +++ b/src/activities/memory-enumerate/resource/3/Data.qml @@ -55,7 +55,7 @@ data: [ { // Level 1 - "columns": 2, + "columns": 4, "rows": 2, "texts": texts.slice(0, 4), "images": images.slice(0, 4), diff --git a/src/activities/memory-enumerate/resource/4/Data.qml b/src/activities/memory-enumerate/resource/4/Data.qml --- a/src/activities/memory-enumerate/resource/4/Data.qml +++ b/src/activities/memory-enumerate/resource/4/Data.qml @@ -63,8 +63,8 @@ data: [ { // Level 1 - "columns": 3, - "rows": 2, + "columns": 4, + "rows": 3, "texts": texts.slice(0, 6), "images": images.slice(0, 6), "sounds": sounds.slice(0, 6) diff --git a/src/activities/memory-enumerate/resource/5/Data.qml b/src/activities/memory-enumerate/resource/5/Data.qml --- a/src/activities/memory-enumerate/resource/5/Data.qml +++ b/src/activities/memory-enumerate/resource/5/Data.qml @@ -69,8 +69,8 @@ data: [ { // Level 1 - "columns": 3, - "rows": 2, + "columns": 4, + "rows": 3, "texts": texts.slice(0, 7), "images": images.slice(0, 7), "sounds": sounds.slice(0, 7) diff --git a/src/activities/memory-enumerate/resource/6/Data.qml b/src/activities/memory-enumerate/resource/6/Data.qml --- a/src/activities/memory-enumerate/resource/6/Data.qml +++ b/src/activities/memory-enumerate/resource/6/Data.qml @@ -72,7 +72,7 @@ data: [ { // Level 1 "columns": 4, - "rows": 2, + "rows": 4, "texts": texts.slice(0, 8), "images": images.slice(0, 8), "sounds": sounds.slice(0, 8) diff --git a/src/activities/memory-enumerate/resource/7/Data.qml b/src/activities/memory-enumerate/resource/7/Data.qml --- a/src/activities/memory-enumerate/resource/7/Data.qml +++ b/src/activities/memory-enumerate/resource/7/Data.qml @@ -76,7 +76,7 @@ data: [ { // Level 1 "columns": 4, - "rows": 2, + "rows": 4, "texts": texts.slice(0, 9), "images": images.slice(0, 9), "sounds": sounds.slice(0, 9) diff --git a/src/activities/memory-enumerate/resource/8/Data.qml b/src/activities/memory-enumerate/resource/8/Data.qml --- a/src/activities/memory-enumerate/resource/8/Data.qml +++ b/src/activities/memory-enumerate/resource/8/Data.qml @@ -80,7 +80,7 @@ data: [ { // Level 1 "columns": 5, - "rows": 2, + "rows": 4, "texts": texts.slice(0, 10), "images": images.slice(0, 10), "sounds": sounds.slice(0, 10) diff --git a/src/activities/memory/memory.js b/src/activities/memory/memory.js --- a/src/activities/memory/memory.js +++ b/src/activities/memory/memory.js @@ -70,7 +70,7 @@ sounds ? sounds.length : 0, texts ? texts.length : 0) - if(rows * columns > maxData) { + if(rows * columns > maxData * 2) { console.log("ERROR: Memory dataset does not have enough data pairs at level ", currentLevel + 1) return