From 13d3aa1ce9d035aceb189832a3194d5c2e40892d Mon Sep 17 00:00:00 2001
From: Sakse Dalum <don.s@artescient.at>
Date: Wed, 8 Aug 2012 17:41:19 +0200
Subject: [PATCH] Made lever toggle arrow block.

---
 robotgame/block.py       | 36 +++++++++++++++++++++++++++++++++++-
 robotgame/level1.py      | 22 +++++++++++++++-------
 robotgame/worldobject.py |  6 +++---
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/robotgame/block.py b/robotgame/block.py
index 4005b7a..912820c 100644
--- a/robotgame/block.py
+++ b/robotgame/block.py
@@ -55,4 +55,38 @@ class Block(worldobject.WorldObject):
                                - self.level.camera_y))
 
 class ArrowBlock(Block):
-    pass
+    def __init__(self, level, x, y, anim='arrow_up', movable=True, is_up=True):
+        self.__dict__.update(locals())
+        worldobject.WorldObject.__init__(self, level, x, y, movable=movable)
+
+        self.frame = 0
+        self.anim_speed = 15
+        self.setting = False
+
+    def activate(self, setting):
+        self.movable = True
+        if self.check_move(0, 0):
+            self.is_up = not setting
+        self.movable = False
+
+    def update(self, e, t, dt):
+        # Update the animation
+        if not self.is_up:
+            self.frame = min(self.frame + self.anim_speed * dt,
+                             len(self.level.imgs[self.anim]) - 1)
+        else:
+            self.frame = max(self.frame - self.anim_speed * dt,
+                             0)
+
+        if self.frame == len(self.level.imgs[self.anim]) - 1:
+            self.movable = self.blocking = False
+            self.z = -48
+        else:
+            self.movable = self.blocking = True
+            self.z = 0
+
+        worldobject.WorldObject.update(self, e, t, dt)
+
+    def draw(self, window):
+        self.img = self.level.imgs[self.anim][int(self.frame)]
+        Block.draw(self, window)
diff --git a/robotgame/level1.py b/robotgame/level1.py
index 31b993c..347d5c2 100644
--- a/robotgame/level1.py
+++ b/robotgame/level1.py
@@ -47,14 +47,17 @@ class Level1(level.Level):
                 self.tiles.append(
                     tile.Tile(self, i*64, j*48, self.imgs['ground1']))
 
-        for i in range(10):
-            self.objects.append(block.Block(self, random.randint(0, 10)*64,
-                                            random.randint(0, 10)*48,
-                                            self.imgs['block1'],
-                                            movable=True))
+        # for i in range(10):
+        #     self.objects.append(block.Block(self, random.randint(0, 10)*64,
+        #                                     random.randint(0, 10)*48,
+        #                                     self.imgs['block1'],
+        #                                     movable=True))
 
         self.objects.append(boulder.Boulder(self, 64, 48))
-        self.objects.append(lever.Lever(self, 128, 48*2, [], toggling=True))
+        arrow_block = block.ArrowBlock(self, 64, 0)
+        lever1 = lever.Lever(self, 128, 48*2, [arrow_block.activate],
+                            toggling=True)
+        self.objects.extend([lever1, arrow_block])
         self.objects.append(lever.Lever(self, 128, 48*3, [], toggling=False))
         self.objects.append(lever.Lever(self, 128*2, 48*3, [], toggling=False,
                                         anim='lever_updown'))
@@ -82,7 +85,12 @@ class Level1(level.Level):
              ('boulder_left', os.path.join('boulder', 'right')),
 
              ('lever_updown', os.path.join('lever', 'down-up')),
-             ('lever_leftright', os.path.join('lever', 'left-right'))]
+             ('lever_leftright', os.path.join('lever', 'left-right')),
+
+             ('arrow_up', os.path.join('matt', 'up')),
+             ('arrow_right', os.path.join('matt', 'right')),
+             ('arrow_down', os.path.join('matt', 'down')),
+             ('arrow_left', os.path.join('matt', 'right')),]
             ):
 
             self.imgs[anim] = []
diff --git a/robotgame/worldobject.py b/robotgame/worldobject.py
index 35bde80..fe129a6 100644
--- a/robotgame/worldobject.py
+++ b/robotgame/worldobject.py
@@ -31,7 +31,7 @@ import copy
 class WorldObject(object):
     def __init__(self, level, x, y, z=0, direction=(1, 0), speed=4,
                  tile_x=64, tile_y=48,
-                 movable=False):
+                 movable=False, blocking=True):
         self.__dict__.update(locals())
 
         self.init_x = self.move_x = self.x = self.x - (self.x % self.tile_x)
@@ -54,8 +54,8 @@ class WorldObject(object):
             for obj in self.level.objects:
                 if (obj.x == self.x + move_x * self.tile_x
                     and obj.y == self.y + move_y * self.tile_y
-                    and obj != self and obj != self.holder
-                    and obj != self.holding):
+                    and obj is not self and obj is not self.holder
+                    and obj is not self.holding and obj.blocking):
                     return False
             return True
         return False