Merge branch 'master' of hongabar.org:robotgame

resources/graphics/TODO.txt

@@ -1,9 +1,10 @@
-	wheel
+DONE	søjle
+DONE	søjle som kan hæve/sænke
 	water/lava/to be discussed
-done	well with alpha in center to allow coloured light
+DONE	well with alpha in center to allow coloured light
-	spaceship
+dummy	spaceship
-	walls (in-door)
+dummy	walls (in-door)
-	gate
+dummy	gate
 	numbered stones (symbols to be discussed)
-done	floor tiles
+DONE	floor tiles
 	weight scale indicator (arrow moving 180 degrees from left to right)

resources/graphics/elevating_column/readme

@@ -0,0 +1,6 @@
+frame 02 is basic (entirely lowered)
+frame 08 is stage 1
+frame 14 is stage 2
+frame 20 is stage 3
+frame 26 is max
+

robotgame/level1.py

@@ -418,14 +418,14 @@ class Wheel(block.Block):
 
         self.frame = 0
         self.anim_speed = 15
-        self.nsettings = 4
+        self.nsettings = 5
         self.setting = random.randint(0, self.nsettings - 1)
         if self.immitate:
             self.on = self.setting == self.immitate.setting
 
         self.init_setting = self.setting
 
-        self.anim = 'stairs'
+        self.anim = 'elevating_column'
 
         self.anim_direction = 1
 
@@ -447,7 +447,8 @@ class Wheel(block.Block):
     def update(self, e, t, dt):
         # Update the animation
         l = len(self.level.imgs[self.anim])
-        if not (int(self.frame) == self.setting * l / self.nsettings):
+        if not (int(self.frame) == self.setting * (l - 1)
+                / (self.nsettings - 1)):
             self.frame = ((self.frame + self.anim_speed * dt) % l
                           if (self.setting > 0 and self.anim_direction > 0)
                           or (self.setting == self.nsettings - 1

robotgame/loader.py

@@ -86,6 +86,7 @@ class Loader(object):
              ('arrow_left', os.path.join('matt', 'right')),
 
              ('stairs', 'stairs'),
+             ('elevating_column', 'elevating_column'),
 
              ('mirror', 'mirror')]
             ):