refactoring

[shutbox.git] / src / game.py

diff --git a/src/game.py b/src/game.py
index 5e2fe70df5f0f58f733f7e72e1b46affbeda6392..203f56a9e31fb09ba9b4651418af1d8287ac7e28 100644 (file)
--- a/src/game.py
+++ b/src/game.py
@@ -2,7 +2,7 @@ import random
 
 class Game:
     def __init__(self):
 
 class Game:
     def __init__(self):

-        self._shutable = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+        self._shutable = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

         self._diced = None
         self._options = []
         self._score = 0
         self._diced = None
         self._options = []
         self._score = 0


@@ -10,15 +10,19 @@ class Game:
     def dice(self):
         if not self._diced:
             self._diced = [random.randint(1, 6), random.randint(1, 6)]
     def dice(self):
         if not self._diced:
             self._diced = [random.randint(1, 6), random.randint(1, 6)]

+            self._diced.sort()

             for rods in [ self._diced,
                           [ abs(self._diced[0] - self._diced[1]) ],
                           [ self._diced[0] + self._diced[1] ] ]:
                 if self._can_be_shut(rods):
                     self._options.append(rods)
 
             for rods in [ self._diced,
                           [ abs(self._diced[0] - self._diced[1]) ],
                           [ self._diced[0] + self._diced[1] ] ]:
                 if self._can_be_shut(rods):
                     self._options.append(rods)
 

-    def get_dice(self):
+    def get_diced(self):

         return self._diced
 
         return self._diced
 

+    def get_shutable(self):
+        return self._shutable
+

     def get_options(self):
         return self._options
 
     def get_options(self):
         return self._options