Added the spacecraft to level 1, fixed some bugs when lifting arrow blocks.

This commit is contained in:
Sakse Dalum
2012-08-20 19:23:10 +02:00
parent a627c4f2bb
commit 00bfc53b7b
3 changed files with 48 additions and 14 deletions

View File

@@ -62,9 +62,28 @@ class Level1(level.Level):
self.tiles.append(
tile.Tile(self, i*64, j*48, self.imgs['ground1']))
self.player.set_pos(64 * 15, 48 * 30)
start_pos = 7 * 64, 34 * 48
self.player.set_pos(*start_pos)
self.player.set_init_pos()
self.objects.append(block.Block(self, start_pos[0] - 2 * 64,
start_pos[1] + 48,
self.imgs['spacecraft'], z=16))
self.objects.append(block.InvisBlock(self, start_pos[0] - 2 * 64,
start_pos[1]))
self.objects.append(block.InvisBlock(self, start_pos[0] - 64,
start_pos[1]))
self.objects.append(block.InvisBlock(self, start_pos[0] - 64,
start_pos[1] + 48))
self.objects.append(block.InvisBlock(self, start_pos[0],
start_pos[1] + 48))
self.add_tile(start_pos[0] + 4 * 64, start_pos[1] - 3 * 48,
'indoor%d' % random.randint(1, 6), blocking=False)
self.add_tile(start_pos[0] + 2 * 64, start_pos[1] - 7 * 48,
'indoor%d' % random.randint(1, 6), blocking=False)
for i in range(self.size[0] / 64):
if not i % 3:
self.objects.append(block.Block(self, i * 64,
@@ -536,14 +555,14 @@ class Level1(level.Level):
class CompletionBlock(block.Block):
def __init__(self, level, x, y, task, number):
self.__dict__.update(locals())
block.Block.__init__(self, level, x, y)
block.Block.__init__(self, level, x, y, blocking=False)
def update(self, e, t, dt):
self.img = self.level.imgs['symbol%02d-0016' % (self.task + 12)]
self.img = self.level.imgs['symbol%02d-0018' % (self.task + 12)]
for t in range(1, 4):
if (self.level.task_completions[-t:] == self.level.solution[:t]
and t >= self.number):
self.img = self.level.imgs['symbol%02d-0018' % (self.task + 12)]
self.img = self.level.imgs['symbol%02d-0019' % (self.task + 12)]
break
class Wheel(block.Block):