Added new concepts for level 1 tasks.

robotgame/level1.py

@@ -59,7 +59,7 @@ class Level1(level.Level):
                 self.tiles.append(
                     tile.Tile(self, i*64, j*48, self.imgs['ground1']))
 
-        self.player.set_pos(64 * 15, 48 * 15)
+        self.player.set_pos(64 * 15, 48 * 30)
         self.player.set_init_pos()
 
         for i in range(self.dimensions[0]):
@@ -122,7 +122,7 @@ class Level1(level.Level):
                       'moat_corner_south')
         self.add_tile(task1_pos[0] - 64 * 2,
                       task1_pos[1] + 48,
-                      'moat_end_horizontal')
+                      'moat_horizontal')
         self.add_tile(task1_pos[0] + 64 * 6,
                       task1_pos[1] + 48,
                       'moat_end_horizontal_flip')
@@ -269,7 +269,7 @@ class Level1(level.Level):
 
         ### Task 3: Colour blocks
 
-        task3_pos = (64 * 15, 48 * 18)
+        task3_pos = (64 * 15, 48 * 20)
 
         # Abstract "boxes", actually colour fields
         boxes = logic.colourboxes.generate_colour_boxes(1, 3)
@@ -408,7 +408,7 @@ class Level1(level.Level):
         ### Task 5: Teleporters
 
         task5_size = 5, 8 # y, x -- Note, inverted.
-        task5_pos = (64 * 10, 48 * 10)
+        task5_pos = (64 * 12, 48 * 19)
 
         task5_nturns = random.randint(2, 4) * 2 - 1
 
@@ -447,9 +447,9 @@ class Level1(level.Level):
         self.add_tile(task5_pos[0] + 64,
                       task5_pos[1] + 48,
                       'moat_end_horizontal_flip')
-        self.add_tile(task5_pos[0] + 64,
-                      task5_pos[1] - task5_size[0] * 48,
-                      'moat_end_horizontal_flip')
+        # self.add_tile(task5_pos[0] + 64,
+        #               task5_pos[1] - task5_size[0] * 48,
+        #               'moat_end_horizontal_flip')
         self.add_tile(task5_pos[0] - 64 * (task5_size[1] + 1),
                       task5_pos[1] + 48,
                       'moat_corner_south')