Update - from Jacques

Author: artyprog

memory/src/memory.py

@@ -1,26 +1,27 @@
-rgb2hex = JS.rgb2hex
-color1 = rgb2hex("rgba(255,0,0,0)")
-color2 = rgb2hex("rgba(255,255,0,0)")
-color3 = rgb2hex("rgba(255,255,255,0)")
-color4 = rgb2hex("rgba(255,0,255,0)")
-color5 = rgb2hex("rgba(255,80,80,0)")
-color6 = rgb2hex("rgba(255,128,0,0)")
-color7 = rgb2hex("rgba(255,128,255,0)")
-color8 = rgb2hex("rgba(255,0,128,0)")
-
-colors = [color1,color2, color3, color4, color5, color6, color7, color8]
-allcolors = [color for  tuplecolor in zip(colors, colors) for color in tuplecolor]
+# memory.py
+# This file is translated to Javascript using Transcrypt
+
+colors = [JS.rgb2hex("rgba({}, 0)".format (color)) for color in  [
+    (0, 0, 0),
+    (0, 0, 255),
+    (0, 255, 0),
+    (0, 255, 255),
+    (255, 0, 0),
+    (255, 0, 255),
+    (255, 255, 0),
+    (255, 255, 255)
+]]
+
+allcolors = [color for tuplecolor in zip(colors, colors) for color in tuplecolor]
 JS.shuffle(allcolors)
 
-
 # Helper Functions:
 def all(iterable):
     for element in iterable:
         if not element:
             return False
     return True
 
-
 # Main Grid wich contents all the cells
 # Grille principale contenant les cellules
 class Grid:
@@ -40,7 +41,7 @@ def  display(self):
         for num in cells:
             color = allcolors[num]
             i, j = num % self.cols, num // self.rows
-            posx, posy  = i *(128  + self.offset ), j * (128  + self.offset )
+            posx, posy  = i *(128  + self.offset ), j * (128  + self.offset ) 
 
             # FrontFace : Sprite or Color
             sprite = self.game.rectangle(128, 128, color)
@@ -50,8 +51,8 @@ def  display(self):
             sprite.content  = color
             sprite.showed = False
 
-            # Backface
-            rectb = self.game.rectangle(128, 128, "blue")
+            # Backface 
+            rectb = self.game.rectangle(128, 128, "lightGray")
             rectb.x = posx
             rectb.y = posy
             rectb.num = num
@@ -60,11 +61,11 @@ def  display(self):
 
 
 # Game Handler
-# Gestion du Jeu
+# Gestion du Jeu                                     
 class Memory:
-    def __init__(self, width=512, height=512):
+    def __init__(self, width=524, height=524):
         self.game = hexi(width, height, self.setup)
-        self.game.backgroundColor = "seagrean"
+        self.game.backgroundColor = "seaGreen"
         self.mouse = self.game.pointer
         self.mouse.tap = self.tap
         self.grid = Grid(self.game)
@@ -74,67 +75,73 @@ def __init__(self, width=512, height=512):
     def tap(self):
         self.tapped = True
 
-    def setup(self):
+    def setup(self):        
         self.game.scaleToWindow("seaGreen")
-        self.grid.display()
+        self.grid.display() 
         self.game.state = self.play
 
     def get_curcell(self):
         for i in range(self.grid.rows):
             for j in range(self.grid.cols):
                 curcell = self.grid.ligs[i][j]
-                if(self.game.hit(self.game.pointer, curcell)):
-                    self.curcell = curcell
+                if self.game.hit(self.game.pointer, curcell):
+                    self.curcell = curcell      
 
     def compare_cells(self):
 
         if len(self.clickedcells) < 2:
             return
 
         numrows = self.grid.rows
-        numcols = self.grid.cols
+        numcols = self.grid.cols 
 
         def resetcell(cells):
             def _reset():
                 cells[0].alpha = 1
                 cells[1].alpha = 1
                 self.clickedcells = []
-            return _reset
+            return _reset 
 
         cella, cellb = self.clickedcells[:2]
-        if (cella.num != cellb.num ):
-                icella, jcella = cella.num % numcols, cella.num // numrows
-                icellb, jcellb = cellb.num % numcols, cellb.num // numrows
-                spritea = self.grid.spr[icella][jcella]
-                spriteb  = self.grid.spr[icellb][jcellb]
-                contenta = spritea.content
-                contentb = spriteb.content
-                cellb.alpha = 0
-                cella.alpha = 0
-                if (contenta != contentb):
-                    setTimeout(resetcell([cella, cellb]), 1000)
-                else:
-                    spritea.showed = True
-                    spriteb.showed = True
-                    self.clickedcells = []
-
-
+        if cella.num == cellb.num:
+            self.clickedcells = self.clickedcells [:1]
+            return
+        else:
+            icella, jcella = cella.num % numcols, cella.num // numrows
+            icellb, jcellb = cellb.num % numcols, cellb.num // numrows
+            spritea = self.grid.spr[icella][jcella]
+            spriteb  = self.grid.spr[icellb][jcellb]
+            contenta = spritea.content 
+            contentb = spriteb.content                     
+            cellb.alpha = 0
+            cella.alpha = 0                     
+            if contenta != contentb:
+                setTimeout(resetcell([cella, cellb]), 500)
+            else:
+                spritea.showed = True
+                spriteb.showed = True
+                self.clickedcells = []
+                
     def check_endgame(self):
+        def endgame ():
+            for s in lst_spr:
+                s.alpha = 0
+            self.game.state = self.end      
+        
         # flatten liste sprites
         # On 'applatit la liste des sprites'
         lst_spr = [sprite for liste_sprites in self.grid.spr for sprite in liste_sprites]
         showed_values = [s.showed for s in lst_spr]
-        if (all(showed_values)):
-            for s in lst_spr:
-                s.alpha = 0
-            self.game.state = self.end
-
+        if all(showed_values):
+            setTimeout (endgame, 2000)
+ 
     def play(self):
-        self.check_endgame()
+        self.check_endgame()     
         self.get_curcell()
 
-        if (self.mouse.tapped):
-            self.clickedcells.append(self.curcell) if self.curcell not in self.clickedcells else None
+        if self.mouse.tapped: 
+            lc = len(self.clickedcells)
+            self.clickedcells.append(self.curcell)           
             self.mouse.tapped = False
             self.compare_cells()