Changeset 116:10d32d7755ff

Timestamp:

12/20/10 14:32:28 (5 years ago)

Author:

Daniil Alexeyevsky <me.dendik@òÀæ>

Branch:

default

Parents:

114:793011c1119e (diff), 115:4cafedd51b69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automated merge with òÀËssh://kodomo/snake

Files:

• snake.py (modified) (2 diffs)
• snake.py (modified) (1 diff, 1 prop)

snake.py

@@ -117 +117 @@
         char = char.lower()
         assert char in self.codes, "Illegal symbol in rule: %s" % char
-        cell = engine.Cell(x, y, self.snake)
+        cell = engine.Cell(x, y)
+        cell.snake = self.snake
         if char in 'htb':
             if is_my:
@@ -132 +133 @@
     def applies (self, field, x, y):
         """True if the rule applies in the field at position (x,y)."""
+        wall = engine.Cell(-1, -1)
+        wall.type = 'void'
+
         for px, fx in zip(range(7), range(x - 3, x + 4)):
             for py, fy in zip(range(7), range(y - 3, y + 4)):
-                if (fx, fy) in field:
-                    if field[fx, fy] != self.pattern[px, py]:
-                        return False
-                else:
-                    if self.pattern[px, py].type != 'any':
-                        return False
+                if field.get((fx, fy), wall) != self.pattern[px, py]:
+                    return False
         return True
 

snake.py

@@ -66 +66 @@
         for cell in self.cells:
             cell.snake = self
+        for cell in self.cells:
+            cell.type = 'body'
         self.cells[0].type = 'head'
-        for cell in self.cells[1:-1]:
-            cell.type = 'body'
         self.cells[-1].type = 'tail'
         return