ngws
/
a-robots-conundrum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed invalid keyword argument error.

This commit is contained in:
Sakse Dalum 2012-08-10 12:56:13 +02:00
parent 4afd08724f
commit 4eab2f55ed
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
robotgame/block.py
View File

@ -197,8 +197,7 @@ class ActionBlock(Block):
def __init__(self, level, x, y, action=None, movable=True): def __init__(self, level, x, y, action=None, movable=True):
self.__dict__.update(locals()) self.__dict__.update(locals())
Block.__init__( Block.__init__(
self, level, x, y, img=level.imgs['block1'], self, level, x, y, 'block1', movable=movable)
movable=movable)
self._last_pos = None self._last_pos = None
def update(self, e, t, dt): def update(self, e, t, dt):

11
robotgame/level1.py
View File

@ -203,7 +203,7 @@ class Level1(level.Level):
boxes += boxes boxes += boxes
boxes += [logic.colourboxes.generate_random_box(1) for _ in range(3)] boxes += [logic.colourboxes.generate_random_box(1) for _ in range(3)]
random.shuffle(boxes) random.shuffle(boxes)
pos_colour = {} pos_colour = {}
for box, (x, y) in zip(boxes, itertools.product(range(3), range(3))): for box, (x, y) in zip(boxes, itertools.product(range(3), range(3))):
# self.tiles.append(tile.Tile(self, x * 64 + task3_pos[0], # self.tiles.append(tile.Tile(self, x * 64 + task3_pos[0],
@ -216,13 +216,15 @@ class Level1(level.Level):
for i in range(3)] for i in range(3)]
self.objects.extend(action_blocks) self.objects.extend(action_blocks)
wells = [block.ColorWell(self, task3_pos[0] + 64, task3_pos[1] + 48 * 5)] wells = [block.ColorWell(self, task3_pos[0] + 64,
task3_pos[1] + 48 * 5)]
self.objects.extend(wells) self.objects.extend(wells)
def update_wells(block): def update_wells(block):
cur_boxes = [] cur_boxes = []
for block in action_blocks: for block in action_blocks:
box = pos_colour.get(((block.x - task3_pos[0]) / 64, (block.y - task3_pos[1] - 48) / 48)) box = pos_colour.get(((block.x - task3_pos[0]) / 64,
(block.y - task3_pos[1] - 48) / 48))
if box: if box:
cur_boxes.append(box) cur_boxes.append(box)
@ -235,8 +237,7 @@ class Level1(level.Level):
for b in action_blocks: for b in action_blocks:
b.action = update_wells b.action = update_wells
### Task 4: Inverted bits ### Task 4: Inverted bits
task4_pos = (64 * 13, 48 * 13) task4_pos = (64 * 13, 48 * 13)