fix mixup re low score retrieval

3 files changed, 12 insertions, 11 deletions

diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py
index 5962772..6557b68 100644
--- a/VisualMatchActivity.py
+++ b/VisualMatchActivity.py
@@ -67,10 +67,10 @@ from game import Game
 
 help_palettes = {}
 
-BEGINNER = 2
-INTERMEDIATE = 0
-EXPERT = 1
-LEVEL_LABELS = [_('intermediate'), _('expert'), _('beginner')]
+BEGINNER = 0
+INTERMEDIATE = 1
+EXPERT = 2
+LEVEL_LABELS = [_('beginner'),_('intermediate'), _('expert')]
 LEVEL_DECKSIZE = [DECKSIZE / 3, DECKSIZE, DECKSIZE / 9]
 
 NUMBER_O_BUTTONS = {}
@@ -215,10 +215,11 @@ class VisualMatchActivity(activity.Activity):
         self._play_level = int(self._read_metadata('play_level', 2))
         self._robot_time = int(self._read_metadata('robot_time', 60))
         self._card_type = self._read_metadata('cardtype', 'pattern')
-        self._low_score = [int(self._read_metadata(
-                    'low_score_intermediate', -1)),
-                           int(self._read_metadata('low_score_expert', -1)),
-                           int(self._read_metadata('low_score_beginner', -1))]
+        self._low_score = [int(self._read_metadata('low_score_beginner', -1)),
+                           int(self._read_metadata('low_score_intermediate',
+                                                   -1)),
+                           int(self._read_metadata('low_score_expert', -1))]
+
         self._all_scores = self._data_loader(
             self._read_metadata('all_scores', '[]'))
         self._numberO = int(self._read_metadata('numberO', PRODUCT))
diff --git a/constants.py b/constants.py
index 9cdddb7..97dcbaf 100644
--- a/constants.py
+++ b/constants.py
@@ -45,7 +45,7 @@ DICE = 4
 LOW = 'low'
 MEDIUM = 'medium'
 HIGH = 'high'
-DIFFICULTY_LEVEL = [MEDIUM, HIGH, LOW]
+DIFFICULTY_LEVEL = [LOW, MEDIUM, HIGH]
 
 RED_STROKE = '#FF6040'
 RED_FILL = '#FFC4B8'
diff --git a/grid.py b/grid.py
index a1c82b5..f9b0900 100644
--- a/grid.py
+++ b/grid.py
@@ -96,9 +96,9 @@ class Grid:
                 return i
         return None  # No empty slots
 
-    def replace(self, clicked_set, deck):
+    def replace(self, deck):
         ''' Deal new cards. '''
-        for j, a in enumerate(clicked_set):
+        for j in range(3):
             # Don't add new cards if bottom row is occupied
             if self.cards_in_grid() < DEAL:
                 if not deck.empty():