Merge branch 'master' of hongabar.org:robotgame

This commit is contained in:
Sakse Dalum 2012-08-10 14:43:12 +02:00
commit f11ad42bfc
2 changed files with 74 additions and 2 deletions

View File

@ -56,8 +56,54 @@ class Level3(level.Level):
# self.tiles.append( # self.tiles.append(
# tile.Tile(self, i*64, j*48, self.imgs['ground1'])) # tile.Tile(self, i*64, j*48, self.imgs['ground1']))
task_start = (2, 2)
task_size = (5, 5)
# Abstract "boxes", actually colour fields
boxes = logic.colourboxes.generate_colour_boxes(4, 6)
boxes += boxes
boxes += [logic.colourboxes.generate_random_box(4) for _ in range(12)]
random.shuffle(boxes)
pos_colour = {}
for box, (x, y) in zip(boxes, itertools.product(range(6), range(4))):
self.tiles.append(tile.Tile(self, 64 * (x + task_start[0] + 1),
48 * (y + task_start[1] + 1),
self.imgs['ground1']))
pos_colour[(x, y)] = box
self.draw_background() self.draw_background()
action_blocks = [block.ActionBlock(self, 64 * (i + 1 + task_start[0]),
48 * task_start[1], movable=True)
for i in range(6)]
self.objects.extend(action_blocks)
wells = [block.ColorWell(self, task_start[0] * 64, task_start[1] * 48),
block.ColorWell(self, (task_start[0] + 7) * 64, task_start[1] * 48),
block.ColorWell(self, task_start[0] * 64, (task_start[1] + 5) * 48),
block.ColorWell(self, (task_start[0] + 7) * 64, (task_start[1] + 5) * 48),
]
self.objects.extend(wells)
def update_wells(block):
cur_boxes = []
for block in action_blocks:
box = pos_colour.get((block.x / 64 - task_start[0] - 1,
block.y / 48 - task_start[1] - 1))
if box:
cur_boxes.append(box)
if not cur_boxes:
well_colours = [(0, 0, 0)] * len(wells)
else:
well_colours = logic.colourboxes.get_colours(cur_boxes)
for well, color in zip(wells, well_colours):
well.set_colour(*color)
for b in action_blocks:
b.action = update_wells
def load(self): def load(self):
"""Load all resources used in the level.""" """Load all resources used in the level."""
@ -67,11 +113,37 @@ class Level3(level.Level):
self.imgs[tile] = pygame.image.load(os.path.join( self.imgs[tile] = pygame.image.load(os.path.join(
self.graphics_dir, 'tiles', '%s.png' % tile)) self.graphics_dir, 'tiles', '%s.png' % tile))
block_list = ['block1'] block_list = ['block1', 'block1_lifted']
for block in block_list: for block in block_list:
self.imgs[block] = pygame.image.load(os.path.join( self.imgs[block] = pygame.image.load(os.path.join(
self.graphics_dir, 'blocks', '%s.png' % block)) self.graphics_dir, 'blocks', '%s.png' % block))
# Load animations
for anim, directory in (
[('lever_updown', os.path.join('lever', 'down-up')),
]
):
self.imgs[anim] = []
# Find all image files for the given animation
anim_files = []
for root, dirs, files in os.walk(os.path.join(
self.graphics_dir, directory)):
for f in files:
if re.match(r"^.*\.(png)$", '/'.join([root, f])):
anim_files.append('/'.join([root, f]))
# Sort and load the files
for f in sorted(anim_files):
img = pygame.image.load(f)
# Special treatment:
if anim == 'arrow_left':
img = pygame.transform.flip(img, 1, 0)
self.imgs[anim].append(img)
def restart(self): def restart(self):
for obj in self.objects: for obj in self.objects:
obj.reset_pos() obj.reset_pos()

View File

@ -82,7 +82,7 @@ class Level(level.Level):
self.imgs[tile] = pygame.image.load(os.path.join( self.imgs[tile] = pygame.image.load(os.path.join(
self.graphics_dir, 'tiles', '%s.png' % tile)) self.graphics_dir, 'tiles', '%s.png' % tile))
block_list = ['block1'] block_list = ['block1', 'block1_lifted']
for block in block_list: for block in block_list:
self.imgs[block] = pygame.image.load(os.path.join( self.imgs[block] = pygame.image.load(os.path.join(
self.graphics_dir, 'blocks', '%s.png' % block)) self.graphics_dir, 'blocks', '%s.png' % block))