Simplify logic in comparisons (#462)

Author: vil02

pysollib/game/__init__.py

@@ -1893,8 +1893,7 @@ def _getClosestStack(self, cx, cy, stacks, dragstack):
     def getClosestStack(self, card, dragstack):
         cx, cy = card.x, card.y
         for stacks, rect in self.regions.info:
-            if cx >= rect[0] and cx < rect[2] \
-                    and cy >= rect[1] and cy < rect[3]:
+            if rect[0] <= cx < rect[2] and rect[1] <= cy < rect[3]:
                 return self._getClosestStack(cx, cy, stacks, dragstack)
         return self._getClosestStack(cx, cy, self.regions.remaining, dragstack)
 

pysollib/games/larasgame.py

@@ -242,7 +242,7 @@ def createGame(self):
         for i in range(20):
             s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2))
             x += l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9))
-            y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) \
+            y = y - l.YS * ((ROW_LENGTH + 3) < i < (ROW_LENGTH + 9)) \
                 + l.YS * (i > (ROW_LENGTH + 9))
 
         # Create talon

pysollib/games/special/dashavatara.py

@@ -122,7 +122,7 @@ def __init__(self, x, y, game, yoffset, **cap):
     def currentForce(self, card):
         force = self._getForce(card)
         hour = time.localtime(time.time())[3]
-        if not (hour >= 7 and hour <= 19):
+        if not (7 <= hour <= 19):
             force = not force
         return force
 

pysollib/kivy/tkutil.py

@@ -440,13 +440,13 @@ def _scaleTextureToSize(texture, size):
 
     for bi in range(height):
         bline = bi * width
-        if (bi >= offy) and (bi < (height - offy)):
+        if offy <= bi < (height - offy):
             # transfer
             ai = gh - int((bi - offy) / scale) - 1
             aline = ai * gw
             for bk in range(width):
                 bpos = (bline + bk) * 4
-                if (bk >= offx) and (bk < (width - offx)):
+                if offx <= bk < (width - offx):
                     # transfer
                     ak = int((bk - offx) / scale)
                     apos = (aline + ak) * 4

pysollib/kivy/tkwidget.py

@@ -436,9 +436,7 @@ def _updatepos(self,instance,value):
     def collide_point(self,x,y):
         px,py = self.parent.pos
         sx,sy = self.parent.size
-        if (px<=x and x<(px+sx) and py<=y and y<(py+sy)):
-            return True
-        return False
+        return px <= x < px + sx and py <= y < py + sy
 
     def on_touch_down(self, touch):
         ret = False