add tile value to scoring

3 files changed, 12 insertions, 1 deletions

diff --git a/deck.py b/deck.py
index 907ef45..96b62ee 100644
--- a/deck.py
+++ b/deck.py
@@ -51,6 +51,7 @@ class Deck:
                 [generate_tile_2_lines(-1, 0, 0, 0, 0, -1, 0, 0, scale,
                                         [color, color])], number=i))
             self.tiles[-1].set_paths([[1, 0, 0, 1]])
+            self.tiles[-1].set_value(2)
             i += 1
         for a in range(4):
             self.tiles.append(Tile(sprites,
@@ -58,6 +59,7 @@ class Deck:
                 [generate_tile_2_lines(-1, 0, 1, 0, 0, -1, 0, 1, scale,
                                         [color, color])], number=i))
             self.tiles[-1].set_paths([[1, 1, 1, 1]])
+            self.tiles[-1].set_value(4)
             i += 1
         for a in range(8):
             self.tiles.append(Tile(sprites,
@@ -69,6 +71,7 @@ class Deck:
                  generate_tile_2_lines(0, -1, 1, 0, -1, 0, 0, 1, scale,
                                        [color, color])], number=i))
             self.tiles[-1].set_paths([[1, 1, 0, 0], [0, 0, 1, 1]])
+            self.tiles[-1].set_value(4)
             i += 1
         for a in range(4):
             self.tiles.append(Tile(sprites,
@@ -80,6 +83,7 @@ class Deck:
                  generate_tile_2_lines(0, -1, 1, 0, -1, 0, 0, 0, scale,
                                        [color, color])], number=i))
             self.tiles[-1].set_paths([[1, 1, 0, 0], [0, 0, 0, 1]])
+            self.tiles[-1].set_value(3)
             i += 1
 
         # Remember the current position in the deck.
diff --git a/game.py b/game.py
index f0e600c..46e615f 100644
--- a/game.py
+++ b/game.py
@@ -546,7 +546,7 @@ class Game():
             if not break_in_path[p] and len(self._paths[p]) > 0:
                 for i in self._paths[p]:
                     self.grid.grid[i[0]].set_shape(i[1])
-                self.score += len(self._paths[p])
+                    self.score += self.grid.grid[i[0]].get_value()
 
     def _tile_to_test(self, test_path):
         ''' Find a tile that needs testing. '''
diff --git a/tile.py b/tile.py
index b77261d..e2ccde9 100644
--- a/tile.py
+++ b/tile.py
@@ -28,10 +28,17 @@ class Tile:
         self.orientation = 0
         self.type = tile_type
         self.number = number
+        self.value = 1
         self.spr.set_label_color('#FF0000')
         # self.spr.set_label_attributes(32)
         # self.spr.set_label(str(number))
 
+    def set_value(self, value):
+        self.value = value
+
+    def get_value(self):
+        return self.value
+
     def set_paths(self, paths):
         for c in paths:
             self.paths.append(c)