switch tile label
authorFrank DeMarco <if.self.end@gmail.com>
Fri, 8 Mar 2019 20:28:51 +0000 (15:28 -0500)
committerFrank DeMarco <if.self.end@gmail.com>
Fri, 8 Mar 2019 20:28:51 +0000 (15:28 -0500)
PictureProcessing.py
resource/progress

index 101bb4a..daaaaf5 100644 (file)
@@ -119,7 +119,7 @@ class Editor(GameChild):
     LABEL_PAINT = "Z: PAINT", "A: PAINT"
     LABEL_NEW = "ENTER: NEW", "A: NEW"
     LABEL_SELECT = "ENTER: SELECT", "A: SELECT"
-    LABEL_DRAG = "Z: DRAG BOX", "A: DRAG BOX"
+    LABEL_DRAG = "HOLD Z: BOX", "HOLD A: BOX"
     LABEL_SWAP = "ENTER: SWAP", "A: SWAP"
     LABEL_SOLVED = "SOLVED"
     LABEL_LEFT = "\\27"
@@ -130,9 +130,10 @@ class Editor(GameChild):
     LABEL_TILE_EDIT = "EDIT"
     LABEL_MIX_COLOR = "ENTER: MIX", "A: MIX"
     LABEL_ADD_COLOR = "ENTER: ADD", "A: ADD"
-    LABEL_RED = "\\17 RED \\16"
-    LABEL_GREEN = "\\17 GREEN \\16"
-    LABEL_BLUE = "\\17 BLUE \\16"
+    LABEL_RED = "\\27 RED \\26"
+    LABEL_GREEN = "\\27 GREEN \\26"
+    LABEL_BLUE = "\\27 BLUE \\26"
+    LABEL_SWITCH_TILE = "LEFT SHIFT: SWITCH TILE", "SELECT: SWITCH TILE"
     HEADING_MARGIN = 60
     BUTTONS_MARGIN = 60
     VIEW_MARGIN = 120
@@ -258,6 +259,8 @@ class Editor(GameChild):
         self.label_tile_edit = self.get_label(self.LABEL_TILE_EDIT)
         self.label_tile_new = self.get_label(self.LABEL_TILE_NEW)
         self.label_tile_delete = self.get_label(self.LABEL_TILE_DELETE)
+        self.label_switch_tile = self.get_label(self.LABEL_SWITCH_TILE)
+        self.label_switch_tile.location.centerx = dsr.centerx
         self.arrow_tiles = self.get_label(self.LABEL_TILES)
         self.arrow_tiles.location.midtop = dsr.midtop
         self.arrow_play = self.get_label(self.LABEL_PLAY)
@@ -1017,6 +1020,7 @@ class Editor(GameChild):
                         for label in labels:
                             label.update()
                         self.mixer_cursor.set_size(*active_label.location.size)
+                        self.mixer_cursor.set_frame()
                         self.mixer_cursor.location.center = active_label.location.center
                         self.mixer_cursor.update()
                     self.paint_cursor.location.topleft = \
@@ -1053,9 +1057,11 @@ class Editor(GameChild):
                 if self.box.location.centery > ds.get_rect().centery:
                     self.label_drag.location.top = self.VIEW_MARGIN
                     self.label_back_box.location.top = self.VIEW_MARGIN
+                    self.label_switch_tile.location.bottom = self.label_back_box.location.top - 10
                 else:
                     self.label_drag.location.bottom = ds.get_height() - self.VIEW_MARGIN
                     self.label_back_box.location.bottom = ds.get_height() - self.VIEW_MARGIN
+                    self.label_switch_tile.location.top = self.label_back_box.location.bottom + 10
                 surface = Surface(self.box.location.size)
                 tile = self.get_current_level().tiles[self.tile_index]
                 for x in xrange(0, surface.get_width(), self.get_level_tile_size()):
@@ -1068,6 +1074,7 @@ class Editor(GameChild):
                 self.box.move(1, 1)
                 self.label_drag.update()
                 self.label_back_box.update()
+                self.label_switch_tile.update()
             if self.at_test:
                 interface = self.get_game().interface
                 if interface.closed:
@@ -1185,7 +1192,6 @@ class FlashingCursor(Sprite):
         offset = self.thickness / 2
         surface = Surface((self.size.x + offset * 2, self.size.y + offset * 2))
         rect = offset, offset, self.size.x, self.size.y
-        cursor = Sprite(self)
         if self.flashing:
             self.hue = (self.hue + 30) % 360
             surface.set_colorkey((0, 0, 0))
index b748e2d..9dd2f00 100644 (file)
@@ -1 +1 @@
-0 0
+2 37