Merge branch 'master' of git.sugarlabs.org:nutrition/nutrition

5 files changed, 8 insertions, 0 deletions

diff --git a/game.py b/game.py
index ad8650d..47b2e64 100644
--- a/game.py
+++ b/game.py
@@ -67,6 +67,7 @@ class Game():
         self._group_cards = []
         self._quantity_cards = []
         self._balance_cards = []
+        self._last_twenty = []
         self._background = None
 
         # Generate the sprites we'll need...
@@ -242,6 +243,13 @@ class Game():
         # Choose a random food image from the list and show it.
         self._target = self.food_cards[
             word_list[int(uniform(0, NCARDS))]].type
+        while self._target in self._last_twenty:
+            self._target = self.food_cards[
+                word_list[int(uniform(0, NCARDS))]].type
+        self._last_twenty.append(self._target)
+        if len(self._last_twenty) > 20:
+            self._last_twenty.remove(self._last_twenty[0])
+            
         self._picture_cards[self._target].set_layer(100)
 
     def _name_that_food_group(self):
diff --git a/images/avena.png b/images/avena.png
index 1585dd2..adec08f 100644
--- a/images/avena.png
+++ b/images/avena.png
diff --git a/images/correct.png b/images/correct.png
index 86bb1f2..95f5d5d 100644
--- a/images/correct.png
+++ b/images/correct.png
diff --git a/images/semillas-de-jicaro.png b/images/semillas-de-jicaro.png
index 5160d41..4642958 100644
--- a/images/semillas-de-jicaro.png
+++ b/images/semillas-de-jicaro.png
diff --git a/images/wrong.png b/images/wrong.png
index f184dd1..63084d4 100644
--- a/images/wrong.png
+++ b/images/wrong.png