From 9e3105e5c043c87d22a934a89df9e7da4621220f Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 17:36:59 -0600 Subject: tabs to spaces in map_editor.py This is to maintain consistency in python source code formatting in the project. --- pokemontools/map_editor.py | 1128 ++++++++++++++++++++++---------------------- 1 file changed, 564 insertions(+), 564 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 566d422..362a67f 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -14,636 +14,636 @@ conf = configuration.Config() version = 'red' if version == 'crystal': - map_dir = os.path.join(conf.path, 'maps/') - gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') - to_gfx_name = lambda x : '%.2d' % x - block_dir = os.path.join(conf.path, 'tilesets/') - block_ext = '_metatiles.bin' + map_dir = os.path.join(conf.path, 'maps/') + gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') + to_gfx_name = lambda x : '%.2d' % x + block_dir = os.path.join(conf.path, 'tilesets/') + block_ext = '_metatiles.bin' - palettes_on = True - palmap_dir = os.path.join(conf.path, 'tilesets/') - palette_dir = os.path.join(conf.path, 'tilesets/') + palettes_on = True + palmap_dir = os.path.join(conf.path, 'tilesets/') + palette_dir = os.path.join(conf.path, 'tilesets/') - asm_dir = os.path.join(conf.path, 'maps/') + asm_dir = os.path.join(conf.path, 'maps/') - constants_dir = os.path.join(conf.path, 'constants/') - constants_filename = os.path.join(constants_dir, 'map_constants.asm') + constants_dir = os.path.join(conf.path, 'constants/') + constants_filename = os.path.join(constants_dir, 'map_constants.asm') - header_dir = os.path.join(conf.path, 'maps/') + header_dir = os.path.join(conf.path, 'maps/') elif version == 'red': - map_dir = os.path.join(conf.path, 'maps/') - gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') - to_gfx_name = lambda x : '%.2x' % x - block_dir = os.path.join(conf.path, 'gfx/blocksets/') - block_ext = '.bst' + map_dir = os.path.join(conf.path, 'maps/') + gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') + to_gfx_name = lambda x : '%.2x' % x + block_dir = os.path.join(conf.path, 'gfx/blocksets/') + block_ext = '.bst' - palettes_on = False + palettes_on = False - asm_path = os.path.join(conf.path, 'main.asm') + asm_path = os.path.join(conf.path, 'main.asm') - constants_filename = os.path.join(conf.path, 'constants.asm') + constants_filename = os.path.join(conf.path, 'constants.asm') - header_path = os.path.join(conf.path, 'main.asm') + header_path = os.path.join(conf.path, 'main.asm') else: - raise Exception, 'version must be "crystal" or "red"' + raise Exception, 'version must be "crystal" or "red"' def get_constants(): - lines = open(constants_filename, 'r').readlines() - for line in lines: - if ' EQU ' in line: - name, value = [s.strip() for s in line.split(' EQU ')] - globals()[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b')) + lines = open(constants_filename, 'r').readlines() + for line in lines: + if ' EQU ' in line: + name, value = [s.strip() for s in line.split(' EQU ')] + globals()[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b')) get_constants() class Application(Frame): - def __init__(self, master=None): - self.display_connections = False - Frame.__init__(self, master) - self.grid() - Style().configure("TFrame", background="#444") - self.paint_tile = 1 - self.init_ui() - - def init_ui(self): - self.connections = {} - self.button_frame = Frame(self) - self.button_frame.grid(row=0, column=0, columnspan=2) - self.map_frame = Frame(self) - self.map_frame.grid(row=1, column=0, padx=5, pady=5) - self.picker_frame = Frame(self) - self.picker_frame.grid(row=1, column=1) - - self.new = Button(self.button_frame) - self.new["text"] = "New" - self.new["command"] = self.new_map - self.new.grid(row=0, column=0, padx=2) - - self.open = Button(self.button_frame) - self.open["text"] = "Open" - self.open["command"] = self.open_map - self.open.grid(row=0, column=1, padx=2) - - self.save = Button(self.button_frame) - self.save["text"] = "Save" - self.save["command"] = self.save_map - self.save.grid(row=0, column=2, padx=2) - - self.get_map_list() - self.map_list.grid(row=0, column=3, padx=2) - - - def get_map_list(self): - self.available_maps = sorted(m for m in get_available_maps()) - self.map_list = ttk.Combobox(self.button_frame, height=24, width=24, values=self.available_maps) - if len(self.available_maps): - self.map_list.set(self.available_maps[0]) - - def new_map(self): - self.map_name = None - self.init_map() - self.map.blockdata = [self.paint_tile] * 20 * 20 - self.map.width = 20 - self.map.height = 20 - self.draw_map() - self.init_picker() - - def open_map(self): - self.map_name = self.map_list.get() - self.init_map() - self.draw_map() - self.init_picker() - - def save_map(self): - if hasattr(self, 'map'): - if self.map.blockdata_filename: - with open(self.map.blockdata_filename, 'wb') as save: - save.write(self.map.blockdata) - print 'blockdata saved as %s' % self.map.blockdata_filename - else: - print 'dunno how to save this' - else: - print 'nothing to save' - - def init_map(self): - if hasattr(self, 'map'): - self.map.kill_canvas() - self.map = Map(self.map_frame, self.map_name) - self.init_map_connections() - - def draw_map(self): - self.map.init_canvas(self.map_frame) - self.map.canvas.pack() #.grid(row=1,column=1) - self.map.draw() - self.map.canvas.bind('', self.paint) - self.map.canvas.bind('', self.paint) - - def init_picker(self): - - self.current_tile = Map(self.button_frame, tileset_id=self.map.tileset_id) - self.current_tile.blockdata = [self.paint_tile] - self.current_tile.width = 1 - self.current_tile.height = 1 - self.current_tile.init_canvas() - self.current_tile.draw() - self.current_tile.canvas.grid(row=0, column=4, padx=4) - - if hasattr(self, 'picker'): - self.picker.kill_canvas() - self.picker = Map(self, tileset_id=self.map.tileset_id) - self.picker.blockdata = range(len(self.picker.tileset.blocks)) - self.picker.width = 4 - self.picker.height = len(self.picker.blockdata) / self.picker.width - self.picker.init_canvas(self.picker_frame) - - if hasattr(self.picker_frame, 'vbar'): - self.picker_frame.vbar.destroy() - self.picker_frame.vbar = Scrollbar(self.picker_frame, orient=VERTICAL) - self.picker_frame.vbar.pack(side=RIGHT, fill=Y) - self.picker_frame.vbar.config(command=self.picker.canvas.yview) - - - self.picker.canvas.config(scrollregion=(0,0,self.picker.canvas_width, self.picker.canvas_height)) - self.map_frame.update() - self.picker.canvas.config(height=self.map_frame.winfo_height()) - self.picker.canvas.config(yscrollcommand=self.picker_frame.vbar.set) - self.picker.canvas.pack(side=LEFT, expand=True) - - self.picker.canvas.bind('<4>', lambda event : self.scroll_picker(event)) - self.picker.canvas.bind('<5>', lambda event : self.scroll_picker(event)) - self.picker_frame.vbar.bind('<4>', lambda event : self.scroll_picker(event)) - self.picker_frame.vbar.bind('<5>', lambda event : self.scroll_picker(event)) - - self.picker.draw() - self.picker.canvas.bind('', self.pick_block) - - def scroll_picker(self, event): - if event.num == 4: - self.picker.canvas.yview('scroll', -1, 'units') - elif event.num == 5: - self.picker.canvas.yview('scroll', 1, 'units') - - - def pick_block(self, event): - block_x = int(self.picker.canvas.canvasx(event.x)) / (self.picker.tileset.block_width * self.picker.tileset.tile_width) - block_y = int(self.picker.canvas.canvasy(event.y)) / (self.picker.tileset.block_height * self.picker.tileset.tile_height) - i = block_y * self.picker.width + block_x - self.paint_tile = self.picker.blockdata[i] - - self.current_tile.blockdata = [self.paint_tile] - self.current_tile.draw() - - def paint(self, event): - block_x = event.x / (self.map.tileset.block_width * self.map.tileset.tile_width) - block_y = event.y / (self.map.tileset.block_height * self.map.tileset.tile_height) - i = block_y * self.map.width + block_x - if 0 <= i < len(self.map.blockdata): - self.map.blockdata[i] = self.paint_tile - self.map.draw_block(block_x, block_y) - - def init_map_connections(self): - if not display_connections: - return - for direction in self.map.connections.keys(): - if direction in self.connections.keys(): - if hasattr(self.connections[direction], 'canvas'): - self.connections[direction].kill_canvas() - if self.map.connections[direction] == {}: - self.connections[direction] = {} - continue - self.connections[direction] = Map(self, self.map.connections[direction]['map_name']) - - if direction in ['north', 'south']: - x1 = 0 - y1 = 0 - x2 = x1 + eval(self.map.connections[direction]['strip_length']) - y2 = y1 + 3 - else: # east, west - x1 = 0 - y1 = 0 - x2 = x1 + 3 - y2 = y1 + eval(self.map.connections[direction]['strip_length']) - - self.connections[direction].crop(x1, y1, x2, y2) - self.connections[direction].init_canvas(self.map_frame) - self.connections[direction].canvas.pack(side={'west':LEFT,'east':RIGHT}[direction]) - self.connections[direction].draw() + def __init__(self, master=None): + self.display_connections = False + Frame.__init__(self, master) + self.grid() + Style().configure("TFrame", background="#444") + self.paint_tile = 1 + self.init_ui() + + def init_ui(self): + self.connections = {} + self.button_frame = Frame(self) + self.button_frame.grid(row=0, column=0, columnspan=2) + self.map_frame = Frame(self) + self.map_frame.grid(row=1, column=0, padx=5, pady=5) + self.picker_frame = Frame(self) + self.picker_frame.grid(row=1, column=1) + + self.new = Button(self.button_frame) + self.new["text"] = "New" + self.new["command"] = self.new_map + self.new.grid(row=0, column=0, padx=2) + + self.open = Button(self.button_frame) + self.open["text"] = "Open" + self.open["command"] = self.open_map + self.open.grid(row=0, column=1, padx=2) + + self.save = Button(self.button_frame) + self.save["text"] = "Save" + self.save["command"] = self.save_map + self.save.grid(row=0, column=2, padx=2) + + self.get_map_list() + self.map_list.grid(row=0, column=3, padx=2) + + + def get_map_list(self): + self.available_maps = sorted(m for m in get_available_maps()) + self.map_list = ttk.Combobox(self.button_frame, height=24, width=24, values=self.available_maps) + if len(self.available_maps): + self.map_list.set(self.available_maps[0]) + + def new_map(self): + self.map_name = None + self.init_map() + self.map.blockdata = [self.paint_tile] * 20 * 20 + self.map.width = 20 + self.map.height = 20 + self.draw_map() + self.init_picker() + + def open_map(self): + self.map_name = self.map_list.get() + self.init_map() + self.draw_map() + self.init_picker() + + def save_map(self): + if hasattr(self, 'map'): + if self.map.blockdata_filename: + with open(self.map.blockdata_filename, 'wb') as save: + save.write(self.map.blockdata) + print 'blockdata saved as %s' % self.map.blockdata_filename + else: + print 'dunno how to save this' + else: + print 'nothing to save' + + def init_map(self): + if hasattr(self, 'map'): + self.map.kill_canvas() + self.map = Map(self.map_frame, self.map_name) + self.init_map_connections() + + def draw_map(self): + self.map.init_canvas(self.map_frame) + self.map.canvas.pack() #.grid(row=1,column=1) + self.map.draw() + self.map.canvas.bind('', self.paint) + self.map.canvas.bind('', self.paint) + + def init_picker(self): + + self.current_tile = Map(self.button_frame, tileset_id=self.map.tileset_id) + self.current_tile.blockdata = [self.paint_tile] + self.current_tile.width = 1 + self.current_tile.height = 1 + self.current_tile.init_canvas() + self.current_tile.draw() + self.current_tile.canvas.grid(row=0, column=4, padx=4) + + if hasattr(self, 'picker'): + self.picker.kill_canvas() + self.picker = Map(self, tileset_id=self.map.tileset_id) + self.picker.blockdata = range(len(self.picker.tileset.blocks)) + self.picker.width = 4 + self.picker.height = len(self.picker.blockdata) / self.picker.width + self.picker.init_canvas(self.picker_frame) + + if hasattr(self.picker_frame, 'vbar'): + self.picker_frame.vbar.destroy() + self.picker_frame.vbar = Scrollbar(self.picker_frame, orient=VERTICAL) + self.picker_frame.vbar.pack(side=RIGHT, fill=Y) + self.picker_frame.vbar.config(command=self.picker.canvas.yview) + + + self.picker.canvas.config(scrollregion=(0,0,self.picker.canvas_width, self.picker.canvas_height)) + self.map_frame.update() + self.picker.canvas.config(height=self.map_frame.winfo_height()) + self.picker.canvas.config(yscrollcommand=self.picker_frame.vbar.set) + self.picker.canvas.pack(side=LEFT, expand=True) + + self.picker.canvas.bind('<4>', lambda event : self.scroll_picker(event)) + self.picker.canvas.bind('<5>', lambda event : self.scroll_picker(event)) + self.picker_frame.vbar.bind('<4>', lambda event : self.scroll_picker(event)) + self.picker_frame.vbar.bind('<5>', lambda event : self.scroll_picker(event)) + + self.picker.draw() + self.picker.canvas.bind('', self.pick_block) + + def scroll_picker(self, event): + if event.num == 4: + self.picker.canvas.yview('scroll', -1, 'units') + elif event.num == 5: + self.picker.canvas.yview('scroll', 1, 'units') + + + def pick_block(self, event): + block_x = int(self.picker.canvas.canvasx(event.x)) / (self.picker.tileset.block_width * self.picker.tileset.tile_width) + block_y = int(self.picker.canvas.canvasy(event.y)) / (self.picker.tileset.block_height * self.picker.tileset.tile_height) + i = block_y * self.picker.width + block_x + self.paint_tile = self.picker.blockdata[i] + + self.current_tile.blockdata = [self.paint_tile] + self.current_tile.draw() + + def paint(self, event): + block_x = event.x / (self.map.tileset.block_width * self.map.tileset.tile_width) + block_y = event.y / (self.map.tileset.block_height * self.map.tileset.tile_height) + i = block_y * self.map.width + block_x + if 0 <= i < len(self.map.blockdata): + self.map.blockdata[i] = self.paint_tile + self.map.draw_block(block_x, block_y) + + def init_map_connections(self): + if not display_connections: + return + for direction in self.map.connections.keys(): + if direction in self.connections.keys(): + if hasattr(self.connections[direction], 'canvas'): + self.connections[direction].kill_canvas() + if self.map.connections[direction] == {}: + self.connections[direction] = {} + continue + self.connections[direction] = Map(self, self.map.connections[direction]['map_name']) + + if direction in ['north', 'south']: + x1 = 0 + y1 = 0 + x2 = x1 + eval(self.map.connections[direction]['strip_length']) + y2 = y1 + 3 + else: # east, west + x1 = 0 + y1 = 0 + x2 = x1 + 3 + y2 = y1 + eval(self.map.connections[direction]['strip_length']) + + self.connections[direction].crop(x1, y1, x2, y2) + self.connections[direction].init_canvas(self.map_frame) + self.connections[direction].canvas.pack(side={'west':LEFT,'east':RIGHT}[direction]) + self.connections[direction].draw() class Map: - def __init__(self, parent, name=None, width=20, height=20, tileset_id=2, blockdata_filename=None): - self.parent = parent - - self.name = name - - self.blockdata_filename = blockdata_filename - if not self.blockdata_filename and self.name: - self.blockdata_filename = os.path.join(map_dir, self.name + '.blk') - elif not self.blockdata_filename: - self.blockdata_filename = '' - - asm_filename = '' - if self.name: - if 'asm_dir' in globals().keys(): - asm_filename = os.path.join(asm_dir, self.name + '.asm') - elif 'asm_path' in globals().keys(): - asm_filename = asm_path - - if os.path.exists(asm_filename): - for props in [map_header(self.name), second_map_header(self.name)]: - self.__dict__.update(props) - self.asm = open(asm_filename, 'r').read() - self.events = event_header(self.asm, self.name) - self.scripts = script_header(self.asm, self.name) - - self.tileset_id = eval(self.tileset_id) - - self.width = eval(self.width) - self.height = eval(self.height) - - else: - self.width = width - self.height = height - self.tileset_id = tileset_id - - if self.blockdata_filename: - self.blockdata = bytearray(open(self.blockdata_filename, 'rb').read()) - else: - self.blockdata = [] - - self.tileset = Tileset(self.tileset_id) - - def init_canvas(self, parent=None): - if parent == None: - parent = self.parent - if not hasattr(self, 'canvas'): - self.canvas_width = self.width * 32 - self.canvas_height = self.height * 32 - self.canvas = Canvas(parent, width=self.canvas_width, height=self.canvas_height) - self.canvas.xview_moveto(0) - self.canvas.yview_moveto(0) - - def kill_canvas(self): - if hasattr(self, 'canvas'): - self.canvas.destroy() - - def crop(self, x1, y1, x2, y2): - blockdata = self.blockdata - start = y1 * self.width + x1 - width = x2 - x1 - height = y2 - y1 - self.blockdata = [] - for y in xrange(height): - for x in xrange(width): - self.blockdata += [blockdata[start + y * self.width + x]] - self.blockdata = bytearray(self.blockdata) - self.width = width - self.height = height - - def draw(self): - for i in xrange(len(self.blockdata)): - block_x = i % self.width - block_y = i / self.width - self.draw_block(block_x, block_y) - - def draw_block(self, block_x, block_y): - # the canvas starts at 4, 4 for some reason - # probably something to do with a border - index, indey = 4, 4 - - # Draw one block (4x4 tiles) - block = self.blockdata[block_y * self.width + block_x] - for j, tile in enumerate(self.tileset.blocks[block]): - try: - # Tile gfx are split in half to make vram mapping easier - if tile >= 0x80: - tile -= 0x20 - tile_x = block_x * 32 + (j % 4) * 8 - tile_y = block_y * 32 + (j / 4) * 8 - self.canvas.create_image(index + tile_x, indey + tile_y, image=self.tileset.tiles[tile]) - except: - pass + def __init__(self, parent, name=None, width=20, height=20, tileset_id=2, blockdata_filename=None): + self.parent = parent + + self.name = name + + self.blockdata_filename = blockdata_filename + if not self.blockdata_filename and self.name: + self.blockdata_filename = os.path.join(map_dir, self.name + '.blk') + elif not self.blockdata_filename: + self.blockdata_filename = '' + + asm_filename = '' + if self.name: + if 'asm_dir' in globals().keys(): + asm_filename = os.path.join(asm_dir, self.name + '.asm') + elif 'asm_path' in globals().keys(): + asm_filename = asm_path + + if os.path.exists(asm_filename): + for props in [map_header(self.name), second_map_header(self.name)]: + self.__dict__.update(props) + self.asm = open(asm_filename, 'r').read() + self.events = event_header(self.asm, self.name) + self.scripts = script_header(self.asm, self.name) + + self.tileset_id = eval(self.tileset_id) + + self.width = eval(self.width) + self.height = eval(self.height) + + else: + self.width = width + self.height = height + self.tileset_id = tileset_id + + if self.blockdata_filename: + self.blockdata = bytearray(open(self.blockdata_filename, 'rb').read()) + else: + self.blockdata = [] + + self.tileset = Tileset(self.tileset_id) + + def init_canvas(self, parent=None): + if parent == None: + parent = self.parent + if not hasattr(self, 'canvas'): + self.canvas_width = self.width * 32 + self.canvas_height = self.height * 32 + self.canvas = Canvas(parent, width=self.canvas_width, height=self.canvas_height) + self.canvas.xview_moveto(0) + self.canvas.yview_moveto(0) + + def kill_canvas(self): + if hasattr(self, 'canvas'): + self.canvas.destroy() + + def crop(self, x1, y1, x2, y2): + blockdata = self.blockdata + start = y1 * self.width + x1 + width = x2 - x1 + height = y2 - y1 + self.blockdata = [] + for y in xrange(height): + for x in xrange(width): + self.blockdata += [blockdata[start + y * self.width + x]] + self.blockdata = bytearray(self.blockdata) + self.width = width + self.height = height + + def draw(self): + for i in xrange(len(self.blockdata)): + block_x = i % self.width + block_y = i / self.width + self.draw_block(block_x, block_y) + + def draw_block(self, block_x, block_y): + # the canvas starts at 4, 4 for some reason + # probably something to do with a border + index, indey = 4, 4 + + # Draw one block (4x4 tiles) + block = self.blockdata[block_y * self.width + block_x] + for j, tile in enumerate(self.tileset.blocks[block]): + try: + # Tile gfx are split in half to make vram mapping easier + if tile >= 0x80: + tile -= 0x20 + tile_x = block_x * 32 + (j % 4) * 8 + tile_y = block_y * 32 + (j / 4) * 8 + self.canvas.create_image(index + tile_x, indey + tile_y, image=self.tileset.tiles[tile]) + except: + pass class Tileset: - def __init__(self, tileset_id=0): - self.id = tileset_id - - self.tile_width = 8 - self.tile_height = 8 - self.block_width = 4 - self.block_height = 4 - - self.alpha = 255 - - if palettes_on: - self.get_palettes() - self.get_palette_map() - - self.get_blocks() - self.get_tiles() - - def get_tileset_gfx_filename(self): - filename = None - - if version == 'red': - tileset_defs = open(os.path.join(conf.path, 'main.asm'), 'r').read() - incbin = asm_at_label(tileset_defs, 'Tset%.2X_GFX' % self.id) - print incbin - filename = read_header_macros(incbin, ['filename'], ['INCBIN'])[0][0].replace('"','').replace('.2bpp','.png') - filename = os.path.join(conf.path, filename) - print filename - - if not filename: - filename = os.path.join( - gfx_dir, - to_gfx_name(self.id) + '.png' - ) - - return filename - - def get_tiles(self): - filename = self.get_tileset_gfx_filename() - if not os.path.exists(filename): - import gfx - gfx.to_png(filename.replace('.png','.2bpp'), filename) - self.img = Image.open(filename) - self.img.width, self.img.height = self.img.size - self.tiles = [] - cur_tile = 0 - for y in xrange(0, self.img.height, self.tile_height): - for x in xrange(0, self.img.width, self.tile_width): - tile = self.img.crop((x, y, x + self.tile_width, y + self.tile_height)) - - if hasattr(self, 'palette_map') and hasattr(self, 'palettes'): - # Palette maps are padded to make vram mapping easier. - pal = self.palette_map[cur_tile + 0x20 if cur_tile >= 0x60 else cur_tile] & 0x7 - tile = self.colorize_tile(tile, self.palettes[pal]) - - self.tiles += [ImageTk.PhotoImage(tile)] - cur_tile += 1 - - def colorize_tile(self, tile, palette): - width, height = tile.size - tile = tile.convert("RGB") - px = tile.load() - for y in xrange(height): - for x in xrange(width): - # assume greyscale - which_color = 3 - (px[x, y][0] / 0x55) - r, g, b = [v * 8 for v in palette[which_color]] - px[x, y] = (r, g, b) - return tile - - def get_blocks(self): - filename = os.path.join( - block_dir, - to_gfx_name(self.id) + block_ext - ) - self.blocks = [] - block_length = self.block_width * self.block_height - blocks = bytearray(open(filename, 'rb').read()) - for block in xrange(len(blocks) / (block_length)): - i = block * block_length - self.blocks += [blocks[i : i + block_length]] - - def get_palette_map(self): - filename = os.path.join( - palmap_dir, - str(self.id).zfill(2) + '_palette_map.bin' - ) - self.palette_map = [] - palmap = bytearray(open(filename, 'rb').read()) - for i in xrange(len(palmap)): - self.palette_map += [palmap[i] & 0xf] - self.palette_map += [(palmap[i] >> 4) & 0xf] - - def get_palettes(self): - filename = os.path.join( - palette_dir, - ['morn', 'day', 'nite'][time_of_day] + '.pal' - ) - self.palettes = get_palettes(filename) + def __init__(self, tileset_id=0): + self.id = tileset_id + + self.tile_width = 8 + self.tile_height = 8 + self.block_width = 4 + self.block_height = 4 + + self.alpha = 255 + + if palettes_on: + self.get_palettes() + self.get_palette_map() + + self.get_blocks() + self.get_tiles() + + def get_tileset_gfx_filename(self): + filename = None + + if version == 'red': + tileset_defs = open(os.path.join(conf.path, 'main.asm'), 'r').read() + incbin = asm_at_label(tileset_defs, 'Tset%.2X_GFX' % self.id) + print incbin + filename = read_header_macros(incbin, ['filename'], ['INCBIN'])[0][0].replace('"','').replace('.2bpp','.png') + filename = os.path.join(conf.path, filename) + print filename + + if not filename: + filename = os.path.join( + gfx_dir, + to_gfx_name(self.id) + '.png' + ) + + return filename + + def get_tiles(self): + filename = self.get_tileset_gfx_filename() + if not os.path.exists(filename): + import gfx + gfx.to_png(filename.replace('.png','.2bpp'), filename) + self.img = Image.open(filename) + self.img.width, self.img.height = self.img.size + self.tiles = [] + cur_tile = 0 + for y in xrange(0, self.img.height, self.tile_height): + for x in xrange(0, self.img.width, self.tile_width): + tile = self.img.crop((x, y, x + self.tile_width, y + self.tile_height)) + + if hasattr(self, 'palette_map') and hasattr(self, 'palettes'): + # Palette maps are padded to make vram mapping easier. + pal = self.palette_map[cur_tile + 0x20 if cur_tile >= 0x60 else cur_tile] & 0x7 + tile = self.colorize_tile(tile, self.palettes[pal]) + + self.tiles += [ImageTk.PhotoImage(tile)] + cur_tile += 1 + + def colorize_tile(self, tile, palette): + width, height = tile.size + tile = tile.convert("RGB") + px = tile.load() + for y in xrange(height): + for x in xrange(width): + # assume greyscale + which_color = 3 - (px[x, y][0] / 0x55) + r, g, b = [v * 8 for v in palette[which_color]] + px[x, y] = (r, g, b) + return tile + + def get_blocks(self): + filename = os.path.join( + block_dir, + to_gfx_name(self.id) + block_ext + ) + self.blocks = [] + block_length = self.block_width * self.block_height + blocks = bytearray(open(filename, 'rb').read()) + for block in xrange(len(blocks) / (block_length)): + i = block * block_length + self.blocks += [blocks[i : i + block_length]] + + def get_palette_map(self): + filename = os.path.join( + palmap_dir, + str(self.id).zfill(2) + '_palette_map.bin' + ) + self.palette_map = [] + palmap = bytearray(open(filename, 'rb').read()) + for i in xrange(len(palmap)): + self.palette_map += [palmap[i] & 0xf] + self.palette_map += [(palmap[i] >> 4) & 0xf] + + def get_palettes(self): + filename = os.path.join( + palette_dir, + ['morn', 'day', 'nite'][time_of_day] + '.pal' + ) + self.palettes = get_palettes(filename) time_of_day = 1 def get_palettes(filename): - pals = bytearray(open(filename, 'rb').read()) + pals = bytearray(open(filename, 'rb').read()) - num_colors = 4 - color_length = 2 + num_colors = 4 + color_length = 2 - palette_length = num_colors * color_length + palette_length = num_colors * color_length - num_pals = len(pals) / palette_length + num_pals = len(pals) / palette_length - palettes = [] - for pal in xrange(num_pals): - palettes += [[]] + palettes = [] + for pal in xrange(num_pals): + palettes += [[]] - for color in xrange(num_colors): - i = pal * palette_length - i += color * color_length - word = pals[i] + pals[i+1] * 0x100 - palettes[pal] += [[ - c & 0x1f for c in [ - word >> 0, - word >> 5, - word >> 10, - ] - ]] - return palettes + for color in xrange(num_colors): + i = pal * palette_length + i += color * color_length + word = pals[i] + pals[i+1] * 0x100 + palettes[pal] += [[ + c & 0x1f for c in [ + word >> 0, + word >> 5, + word >> 10, + ] + ]] + return palettes def get_available_maps(): - for root, dirs, files in os.walk(map_dir): - for filename in files: - base_name, ext = os.path.splitext(filename) - if ext == '.blk': - yield base_name + for root, dirs, files in os.walk(map_dir): + for filename in files: + base_name, ext = os.path.splitext(filename) + if ext == '.blk': + yield base_name def map_header(name): - if version == 'crystal': - headers = open(os.path.join(header_dir, 'map_headers.asm'), 'r').read() - label = name + '_MapHeader' - header = asm_at_label(headers, label) - macros = [ 'db', 'db', 'db', 'dw', 'db', 'db', 'db', 'db' ] - attributes = [ - 'bank', - 'tileset_id', - 'permission', - 'second_map_header', - 'world_map_location', - 'music', - 'time_of_day', - 'fishing_group', - ] - values, l = read_header_macros(header, attributes, macros) - attrs = dict(zip(attributes, values)) - return attrs - - elif version == 'red': - headers = open(header_path, 'r').read() - - # there has to be a better way to do this - lower_label = name + '_h' - i = headers.lower().find(lower_label) - if i == -1: - return {} - label = headers[i:i+len(lower_label)] - - header = asm_at_label(headers, label) - macros = [ 'db', 'db', 'db', 'dw', 'dw', 'dw', 'db' ] - attributes = [ - 'tileset_id', - 'height', - 'width', - 'blockdata_label', - 'text_label', - 'script_label', - 'which_connections', - ] - values, l = read_header_macros(header, attributes, macros) - - attrs = dict(zip(attributes, values)) - attrs['connections'], l = connections(attrs['which_connections'], header, l) - - macros = [ 'dw' ] - attributes = [ - 'object_label', - ] - values, l = read_header_macros(header[l:], attributes, macros) - attrs.update(dict(zip(attributes, values))) - - return attrs - - return {} + if version == 'crystal': + headers = open(os.path.join(header_dir, 'map_headers.asm'), 'r').read() + label = name + '_MapHeader' + header = asm_at_label(headers, label) + macros = [ 'db', 'db', 'db', 'dw', 'db', 'db', 'db', 'db' ] + attributes = [ + 'bank', + 'tileset_id', + 'permission', + 'second_map_header', + 'world_map_location', + 'music', + 'time_of_day', + 'fishing_group', + ] + values, l = read_header_macros(header, attributes, macros) + attrs = dict(zip(attributes, values)) + return attrs + + elif version == 'red': + headers = open(header_path, 'r').read() + + # there has to be a better way to do this + lower_label = name + '_h' + i = headers.lower().find(lower_label) + if i == -1: + return {} + label = headers[i:i+len(lower_label)] + + header = asm_at_label(headers, label) + macros = [ 'db', 'db', 'db', 'dw', 'dw', 'dw', 'db' ] + attributes = [ + 'tileset_id', + 'height', + 'width', + 'blockdata_label', + 'text_label', + 'script_label', + 'which_connections', + ] + values, l = read_header_macros(header, attributes, macros) + + attrs = dict(zip(attributes, values)) + attrs['connections'], l = connections(attrs['which_connections'], header, l) + + macros = [ 'dw' ] + attributes = [ + 'object_label', + ] + values, l = read_header_macros(header[l:], attributes, macros) + attrs.update(dict(zip(attributes, values))) + + return attrs + + return {} def second_map_header(name): - if version == 'crystal': - headers = open(os.path.join(header_dir, 'second_map_headers.asm'), 'r').read() - label = name + '_SecondMapHeader' - header = asm_at_label(headers, label) - macros = [ 'db', 'db', 'db', 'db', 'dw', 'db', 'dw', 'dw', 'db' ] - attributes = [ - 'border_block', - 'height', - 'width', - 'blockdata_bank', - 'blockdata_label', - 'script_header_bank', - 'script_header_label', - 'map_event_header_label', - 'which_connections', - ] - - values, l = read_header_macros(header, attributes, macros) - attrs = dict(zip(attributes, values)) - attrs['connections'], l = connections(attrs['which_connections'], header, l) - return attrs - - return {} + if version == 'crystal': + headers = open(os.path.join(header_dir, 'second_map_headers.asm'), 'r').read() + label = name + '_SecondMapHeader' + header = asm_at_label(headers, label) + macros = [ 'db', 'db', 'db', 'db', 'dw', 'db', 'dw', 'dw', 'db' ] + attributes = [ + 'border_block', + 'height', + 'width', + 'blockdata_bank', + 'blockdata_label', + 'script_header_bank', + 'script_header_label', + 'map_event_header_label', + 'which_connections', + ] + + values, l = read_header_macros(header, attributes, macros) + attrs = dict(zip(attributes, values)) + attrs['connections'], l = connections(attrs['which_connections'], header, l) + return attrs + + return {} def connections(which_connections, header, l=0): - directions = { 'north': {}, 'south': {}, 'west': {}, 'east': {} } - - if version == 'crystal': - macros = [ 'db', 'db' ] - attributes = [ - 'map_group', - 'map_no', - ] - - elif version == 'red': - macros = [ 'db' ] - attributes = [ - 'map_id', - ] - - macros += [ 'dw', 'dw', 'db', 'db', 'db', 'db', 'dw' ] - attributes += [ - 'strip_pointer', - 'strip_destination', - 'strip_length', - 'map_width', - 'y_offset', - 'x_offset', - 'window', - ] - for d in directions.keys(): - if d.upper() in which_connections: - values, l = read_header_macros(header, attributes, macros) - header = header[l:] - directions[d] = dict(zip(attributes, values)) - if version == 'crystal': - directions[d]['map_name'] = directions[d]['map_group'].replace('GROUP_', '').title().replace('_','') - elif version == 'red': - directions[d]['map_name'] = directions[d]['map_id'].title().replace('_','') - return directions, l + directions = { 'north': {}, 'south': {}, 'west': {}, 'east': {} } + + if version == 'crystal': + macros = [ 'db', 'db' ] + attributes = [ + 'map_group', + 'map_no', + ] + + elif version == 'red': + macros = [ 'db' ] + attributes = [ + 'map_id', + ] + + macros += [ 'dw', 'dw', 'db', 'db', 'db', 'db', 'dw' ] + attributes += [ + 'strip_pointer', + 'strip_destination', + 'strip_length', + 'map_width', + 'y_offset', + 'x_offset', + 'window', + ] + for d in directions.keys(): + if d.upper() in which_connections: + values, l = read_header_macros(header, attributes, macros) + header = header[l:] + directions[d] = dict(zip(attributes, values)) + if version == 'crystal': + directions[d]['map_name'] = directions[d]['map_group'].replace('GROUP_', '').title().replace('_','') + elif version == 'red': + directions[d]['map_name'] = directions[d]['map_id'].title().replace('_','') + return directions, l def read_header_macros(header, attributes, macros): - values = [] - i = 0 - l = 0 - for l, (asm, comment) in enumerate(header): - if asm.strip() != '': - mvalues = macro_values(asm, macros[i]) - values += mvalues - i += len(mvalues) - if len(values) >= len(attributes): - l += 1 - break - return values, l + values = [] + i = 0 + l = 0 + for l, (asm, comment) in enumerate(header): + if asm.strip() != '': + mvalues = macro_values(asm, macros[i]) + values += mvalues + i += len(mvalues) + if len(values) >= len(attributes): + l += 1 + break + return values, l def event_header(asm, name): - return {} + return {} def script_header(asm, name): - return {} + return {} def macro_values(line, macro): - values = line[line.find(macro) + len(macro):].split(',') - values = [v.replace('$','0x').strip() for v in values] - if values[0] == 'w': # dbw - values = values[1:] - return values + values = line[line.find(macro) + len(macro):].split(',') + values = [v.replace('$','0x').strip() for v in values] + if values[0] == 'w': # dbw + values = values[1:] + return values def db_value(line): - macro = 'db' - return macro_values(line, macro) + macro = 'db' + return macro_values(line, macro) def db_values(line): - macro = 'db' - return macro_values(line, macro) + macro = 'db' + return macro_values(line, macro) from preprocessor import separate_comment def asm_at_label(asm, label): - label_def = label + ':' - lines = asm.split('\n') - for line in lines: - if line.startswith(label_def): - lines = lines[lines.index(line):] - lines[0] = lines[0][len(label_def):] - break - # go until the next label - content = [] - for line in lines: - l, comment = separate_comment(line + '\n') - if ':' in l: - break - content += [[l, comment]] - return content + label_def = label + ':' + lines = asm.split('\n') + for line in lines: + if line.startswith(label_def): + lines = lines[lines.index(line):] + lines[0] = lines[0][len(label_def):] + break + # go until the next label + content = [] + for line in lines: + l, comment = separate_comment(line + '\n') + if ':' in l: + break + content += [[l, comment]] + return content def main(): """ -- cgit v1.2.3 From 2d59e4d3e07d3fe92c6463ce212a2c537f62160b Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 17:39:02 -0600 Subject: move import statements to top of map_editor.py --- pokemontools/map_editor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 362a67f..52da243 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -9,6 +9,8 @@ from PIL import Image, ImageTk import configuration conf = configuration.Config() +from preprocessor import separate_comment +import gfx #version = 'crystal' version = 'red' @@ -368,7 +370,6 @@ class Tileset: def get_tiles(self): filename = self.get_tileset_gfx_filename() if not os.path.exists(filename): - import gfx gfx.to_png(filename.replace('.png','.2bpp'), filename) self.img = Image.open(filename) self.img.width, self.img.height = self.img.size @@ -626,7 +627,6 @@ def db_values(line): return macro_values(line, macro) -from preprocessor import separate_comment def asm_at_label(asm, label): label_def = label + ':' -- cgit v1.2.3 From 6920881598e61eb369a2fdb78922199f637f6ef3 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 18:56:31 -0600 Subject: factor out global configs in map_editor.py --- pokemontools/map_editor.py | 195 +++++++++++++++++++++++++++------------------ 1 file changed, 117 insertions(+), 78 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 52da243..cb7d244 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -7,62 +7,96 @@ import PIL from PIL import Image, ImageTk import configuration -conf = configuration.Config() +config = configuration.Config() from preprocessor import separate_comment import gfx -#version = 'crystal' -version = 'red' +def configure_for_pokered(config=config): + """ + Sets default configuration values for pokered. These should eventually be + moved into the configuration module. + """ + attrs = { + "version": "red", + + "map_dir": os.path.join(config.path, 'maps/'), + "gfx_dir": os.path.join(config.path, 'gfx/tilesets/'), + "to_gfx_name": lambda x : '%.2x' % x, + "block_dir": os.path.join(config.path, 'gfx/blocksets/'), + "block_ext": '.bst', + + "palettes_on": False, -if version == 'crystal': - map_dir = os.path.join(conf.path, 'maps/') - gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') - to_gfx_name = lambda x : '%.2d' % x - block_dir = os.path.join(conf.path, 'tilesets/') - block_ext = '_metatiles.bin' + "asm_path": os.path.join(config.path, 'main.asm'), - palettes_on = True - palmap_dir = os.path.join(conf.path, 'tilesets/') - palette_dir = os.path.join(conf.path, 'tilesets/') + "constants_filename": os.path.join(config.path, 'constants.asm'), - asm_dir = os.path.join(conf.path, 'maps/') + "header_path": os.path.join(config.path, 'main.asm'), + + "time_of_day": 1, + } + return attrs + +def configure_for_pokecrystal(config=config): + """ + Sets default configuration values for pokecrystal. These should eventually + be moved into the configuration module. + """ + attrs = { + "version": "crystal", - constants_dir = os.path.join(conf.path, 'constants/') - constants_filename = os.path.join(constants_dir, 'map_constants.asm') + "map_dir": os.path.join(config.path, 'maps/'), + "gfx_dir": os.path.join(config.path, 'gfx/tilesets/'), + "to_gfx_name": lambda x : '%.2d' % x, + "block_dir": os.path.join(config.path, 'tilesets/'), + "block_ext": '_metatiles.bin', - header_dir = os.path.join(conf.path, 'maps/') + "palettes_on": True, + "palmap_dir": os.path.join(config.path, 'tilesets/'), + "palette_dir": os.path.join(config.path, 'tilesets/'), -elif version == 'red': - map_dir = os.path.join(conf.path, 'maps/') - gfx_dir = os.path.join(conf.path, 'gfx/tilesets/') - to_gfx_name = lambda x : '%.2x' % x - block_dir = os.path.join(conf.path, 'gfx/blocksets/') - block_ext = '.bst' + "asm_dir": os.path.join(config.path, 'maps/'), - palettes_on = False + "constants_filename": os.path.join(os.path.join(config.path, "constants/"), 'map_constants.asm'), - asm_path = os.path.join(conf.path, 'main.asm') + "header_dir": os.path.join(config.path, 'maps/'), - constants_filename = os.path.join(conf.path, 'constants.asm') + "time_of_day": 1, + } + return attrs - header_path = os.path.join(conf.path, 'main.asm') +def configure_for_version(version, config=config): + """ + Overrides default values from the configuration with additional attributes. + """ + if version == "red": + attrs = configure_for_pokered(config) + elif version == "crystal": + attrs = configure_for_pokecrystal(config) + else: + # TODO: pick a better exception + raise Exception( + "Can't configure for this version." + ) -else: - raise Exception, 'version must be "crystal" or "red"' + for (key, value) in attrs.iteritems(): + setattr(config, key, value) + # not really needed since it's modifying the same object + return config -def get_constants(): - lines = open(constants_filename, 'r').readlines() +def get_constants(config=config): + lines = open(config.constants_filename, 'r').readlines() for line in lines: if ' EQU ' in line: name, value = [s.strip() for s in line.split(' EQU ')] globals()[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b')) -get_constants() class Application(Frame): - def __init__(self, master=None): + def __init__(self, master=None, config=config): + self.config = config self.display_connections = False Frame.__init__(self, master) self.grid() @@ -99,7 +133,7 @@ class Application(Frame): def get_map_list(self): - self.available_maps = sorted(m for m in get_available_maps()) + self.available_maps = sorted(m for m in get_available_maps(config=self.config)) self.map_list = ttk.Combobox(self.button_frame, height=24, width=24, values=self.available_maps) if len(self.available_maps): self.map_list.set(self.available_maps[0]) @@ -133,7 +167,7 @@ class Application(Frame): def init_map(self): if hasattr(self, 'map'): self.map.kill_canvas() - self.map = Map(self.map_frame, self.map_name) + self.map = Map(self.map_frame, self.map_name, config=self.config) self.init_map_connections() def draw_map(self): @@ -145,7 +179,7 @@ class Application(Frame): def init_picker(self): - self.current_tile = Map(self.button_frame, tileset_id=self.map.tileset_id) + self.current_tile = Map(self.button_frame, tileset_id=self.map.tileset_id, config=self.config) self.current_tile.blockdata = [self.paint_tile] self.current_tile.width = 1 self.current_tile.height = 1 @@ -155,7 +189,7 @@ class Application(Frame): if hasattr(self, 'picker'): self.picker.kill_canvas() - self.picker = Map(self, tileset_id=self.map.tileset_id) + self.picker = Map(self, tileset_id=self.map.tileset_id, config=self.config) self.picker.blockdata = range(len(self.picker.tileset.blocks)) self.picker.width = 4 self.picker.height = len(self.picker.blockdata) / self.picker.width @@ -207,7 +241,7 @@ class Application(Frame): self.map.draw_block(block_x, block_y) def init_map_connections(self): - if not display_connections: + if not self.display_connections: return for direction in self.map.connections.keys(): if direction in self.connections.keys(): @@ -216,7 +250,7 @@ class Application(Frame): if self.map.connections[direction] == {}: self.connections[direction] = {} continue - self.connections[direction] = Map(self, self.map.connections[direction]['map_name']) + self.connections[direction] = Map(self, self.map.connections[direction]['map_name'], config=self.config) if direction in ['north', 'south']: x1 = 0 @@ -236,26 +270,28 @@ class Application(Frame): class Map: - def __init__(self, parent, name=None, width=20, height=20, tileset_id=2, blockdata_filename=None): + def __init__(self, parent, name=None, width=20, height=20, tileset_id=2, blockdata_filename=None, config=config): self.parent = parent self.name = name + self.config = config + self.blockdata_filename = blockdata_filename if not self.blockdata_filename and self.name: - self.blockdata_filename = os.path.join(map_dir, self.name + '.blk') + self.blockdata_filename = os.path.join(self.config.map_dir, self.name + '.blk') elif not self.blockdata_filename: self.blockdata_filename = '' asm_filename = '' if self.name: - if 'asm_dir' in globals().keys(): - asm_filename = os.path.join(asm_dir, self.name + '.asm') - elif 'asm_path' in globals().keys(): - asm_filename = asm_path + if self.config.asm_dir is not None: + asm_filename = os.path.join(self.config.asm_dir, self.name + '.asm') + elif self.config.asm_path is not None: + asm_filename = self.config.asm_path if os.path.exists(asm_filename): - for props in [map_header(self.name), second_map_header(self.name)]: + for props in [map_header(self.name, config=self.config), second_map_header(self.name, config=self.config)]: self.__dict__.update(props) self.asm = open(asm_filename, 'r').read() self.events = event_header(self.asm, self.name) @@ -276,7 +312,7 @@ class Map: else: self.blockdata = [] - self.tileset = Tileset(self.tileset_id) + self.tileset = Tileset(self.tileset_id, config=self.config) def init_canvas(self, parent=None): if parent == None: @@ -331,7 +367,9 @@ class Map: class Tileset: - def __init__(self, tileset_id=0): + def __init__(self, tileset_id=0, config=config): + self.config = config + self.id = tileset_id self.tile_width = 8 @@ -341,7 +379,7 @@ class Tileset: self.alpha = 255 - if palettes_on: + if self.config.palettes_on: self.get_palettes() self.get_palette_map() @@ -351,18 +389,18 @@ class Tileset: def get_tileset_gfx_filename(self): filename = None - if version == 'red': - tileset_defs = open(os.path.join(conf.path, 'main.asm'), 'r').read() + if self.config.version == 'red': + tileset_defs = open(os.path.join(self.config.path, 'main.asm'), 'r').read() incbin = asm_at_label(tileset_defs, 'Tset%.2X_GFX' % self.id) print incbin filename = read_header_macros(incbin, ['filename'], ['INCBIN'])[0][0].replace('"','').replace('.2bpp','.png') - filename = os.path.join(conf.path, filename) + filename = os.path.join(self.config.path, filename) print filename if not filename: filename = os.path.join( - gfx_dir, - to_gfx_name(self.id) + '.png' + self.config.gfx_dir, + self.config.to_gfx_name(self.id) + '.png' ) return filename @@ -401,8 +439,8 @@ class Tileset: def get_blocks(self): filename = os.path.join( - block_dir, - to_gfx_name(self.id) + block_ext + self.config.block_dir, + self.config.to_gfx_name(self.id) + self.config.block_ext ) self.blocks = [] block_length = self.block_width * self.block_height @@ -413,7 +451,7 @@ class Tileset: def get_palette_map(self): filename = os.path.join( - palmap_dir, + self.config.palmap_dir, str(self.id).zfill(2) + '_palette_map.bin' ) self.palette_map = [] @@ -424,13 +462,12 @@ class Tileset: def get_palettes(self): filename = os.path.join( - palette_dir, - ['morn', 'day', 'nite'][time_of_day] + '.pal' + self.config.palette_dir, + ['morn', 'day', 'nite'][self.config.time_of_day] + '.pal' ) self.palettes = get_palettes(filename) -time_of_day = 1 def get_palettes(filename): @@ -462,17 +499,17 @@ def get_palettes(filename): -def get_available_maps(): - for root, dirs, files in os.walk(map_dir): +def get_available_maps(config=config): + for root, dirs, files in os.walk(config.map_dir): for filename in files: base_name, ext = os.path.splitext(filename) if ext == '.blk': yield base_name -def map_header(name): - if version == 'crystal': - headers = open(os.path.join(header_dir, 'map_headers.asm'), 'r').read() +def map_header(name, config=config): + if config.version == 'crystal': + headers = open(os.path.join(config.header_dir, 'map_headers.asm'), 'r').read() label = name + '_MapHeader' header = asm_at_label(headers, label) macros = [ 'db', 'db', 'db', 'dw', 'db', 'db', 'db', 'db' ] @@ -490,8 +527,8 @@ def map_header(name): attrs = dict(zip(attributes, values)) return attrs - elif version == 'red': - headers = open(header_path, 'r').read() + elif config.version == 'red': + headers = open(config.header_path, 'r').read() # there has to be a better way to do this lower_label = name + '_h' @@ -514,7 +551,7 @@ def map_header(name): values, l = read_header_macros(header, attributes, macros) attrs = dict(zip(attributes, values)) - attrs['connections'], l = connections(attrs['which_connections'], header, l) + attrs['connections'], l = connections(attrs['which_connections'], header, l, config=config) macros = [ 'dw' ] attributes = [ @@ -527,9 +564,9 @@ def map_header(name): return {} -def second_map_header(name): - if version == 'crystal': - headers = open(os.path.join(header_dir, 'second_map_headers.asm'), 'r').read() +def second_map_header(name, config=config): + if config.version == 'crystal': + headers = open(os.path.join(config.header_dir, 'second_map_headers.asm'), 'r').read() label = name + '_SecondMapHeader' header = asm_at_label(headers, label) macros = [ 'db', 'db', 'db', 'db', 'dw', 'db', 'dw', 'dw', 'db' ] @@ -552,17 +589,17 @@ def second_map_header(name): return {} -def connections(which_connections, header, l=0): +def connections(which_connections, header, l=0, config=config): directions = { 'north': {}, 'south': {}, 'west': {}, 'east': {} } - if version == 'crystal': + if config.version == 'crystal': macros = [ 'db', 'db' ] attributes = [ 'map_group', 'map_no', ] - elif version == 'red': + elif config.version == 'red': macros = [ 'db' ] attributes = [ 'map_id', @@ -583,9 +620,9 @@ def connections(which_connections, header, l=0): values, l = read_header_macros(header, attributes, macros) header = header[l:] directions[d] = dict(zip(attributes, values)) - if version == 'crystal': + if config.version == 'crystal': directions[d]['map_name'] = directions[d]['map_group'].replace('GROUP_', '').title().replace('_','') - elif version == 'red': + elif config.version == 'red': directions[d]['map_name'] = directions[d]['map_id'].title().replace('_','') return directions, l @@ -645,13 +682,13 @@ def asm_at_label(asm, label): content += [[l, comment]] return content -def main(): +def main(config=config): """ Launches the map editor. """ root = Tk() root.wm_title("MAP EDITOR") - app = Application(master=root) + app = Application(master=root, config=config) try: app.mainloop() @@ -664,4 +701,6 @@ def main(): pass if __name__ == "__main__": - main() + config = configure_for_version("crystal", config) + get_constants(config=config) + main(config=config) -- cgit v1.2.3 From f414cf38f6377d6956308cd78506ed21839bb7ef Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:05:09 -0600 Subject: only set global constants for eval Although I am not sure that using eval is a good idea in the first place... it should go away. --- pokemontools/map_editor.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index cb7d244..cd6e557 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -87,12 +87,13 @@ def configure_for_version(version, config=config): return config def get_constants(config=config): + constants = {} lines = open(config.constants_filename, 'r').readlines() for line in lines: if ' EQU ' in line: name, value = [s.strip() for s in line.split(' EQU ')] - globals()[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b')) - + constants[name] = eval(value.split(';')[0].replace('$','0x').replace('%','0b')) + config.constants = constants class Application(Frame): def __init__(self, master=None, config=config): @@ -255,13 +256,13 @@ class Application(Frame): if direction in ['north', 'south']: x1 = 0 y1 = 0 - x2 = x1 + eval(self.map.connections[direction]['strip_length']) + x2 = x1 + eval(self.map.connections[direction]['strip_length'], self.config.constants) y2 = y1 + 3 else: # east, west x1 = 0 y1 = 0 x2 = x1 + 3 - y2 = y1 + eval(self.map.connections[direction]['strip_length']) + y2 = y1 + eval(self.map.connections[direction]['strip_length'], self.config.constants) self.connections[direction].crop(x1, y1, x2, y2) self.connections[direction].init_canvas(self.map_frame) @@ -297,10 +298,10 @@ class Map: self.events = event_header(self.asm, self.name) self.scripts = script_header(self.asm, self.name) - self.tileset_id = eval(self.tileset_id) + self.tileset_id = eval(self.tileset_id, self.config.constants) - self.width = eval(self.width) - self.height = eval(self.height) + self.width = eval(self.width, self.config.constants) + self.height = eval(self.height, self.config.constants) else: self.width = width -- cgit v1.2.3 From 98d335438a37772fef673d1f27f41b10e1bbd9cf Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:11:54 -0600 Subject: fix up map_editor.py extra newlines --- pokemontools/map_editor.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index cd6e557..44b2d98 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -179,7 +179,6 @@ class Application(Frame): self.map.canvas.bind('', self.paint) def init_picker(self): - self.current_tile = Map(self.button_frame, tileset_id=self.map.tileset_id, config=self.config) self.current_tile.blockdata = [self.paint_tile] self.current_tile.width = 1 @@ -202,7 +201,6 @@ class Application(Frame): self.picker_frame.vbar.pack(side=RIGHT, fill=Y) self.picker_frame.vbar.config(command=self.picker.canvas.yview) - self.picker.canvas.config(scrollregion=(0,0,self.picker.canvas_width, self.picker.canvas_height)) self.map_frame.update() self.picker.canvas.config(height=self.map_frame.winfo_height()) @@ -468,9 +466,6 @@ class Tileset: ) self.palettes = get_palettes(filename) - - - def get_palettes(filename): pals = bytearray(open(filename, 'rb').read()) @@ -498,8 +493,6 @@ def get_palettes(filename): ]] return palettes - - def get_available_maps(config=config): for root, dirs, files in os.walk(config.map_dir): for filename in files: @@ -507,7 +500,6 @@ def get_available_maps(config=config): if ext == '.blk': yield base_name - def map_header(name, config=config): if config.version == 'crystal': headers = open(os.path.join(config.header_dir, 'map_headers.asm'), 'r').read() @@ -641,14 +633,12 @@ def read_header_macros(header, attributes, macros): break return values, l - def event_header(asm, name): return {} def script_header(asm, name): return {} - def macro_values(line, macro): values = line[line.find(macro) + len(macro):].split(',') values = [v.replace('$','0x').strip() for v in values] @@ -664,8 +654,6 @@ def db_values(line): macro = 'db' return macro_values(line, macro) - - def asm_at_label(asm, label): label_def = label + ':' lines = asm.split('\n') -- cgit v1.2.3 From 712f4ce53bbf03807051736c4d08042ff46a0a3d Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:15:33 -0600 Subject: use explicit import of Tkinter components --- pokemontools/map_editor.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 44b2d98..77ecd85 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -1,6 +1,18 @@ import os -from Tkinter import * +from Tkinter import ( + Tk, + Button, + Canvas, + Scrollbar, + VERTICAL, + HORIZONTAL, + RIGHT, + LEFT, + Y, + X, +) + import ttk from ttk import Frame, Style import PIL -- cgit v1.2.3 From 49072b9917a72e9720860a7ee0ca28bda4c425e1 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:41:21 -0600 Subject: replace print with python logging --- pokemontools/map_editor.py | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 77ecd85..221be2b 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -1,4 +1,6 @@ import os +import sys +import logging from Tkinter import ( Tk, @@ -24,6 +26,18 @@ config = configuration.Config() from preprocessor import separate_comment import gfx +def setup_logging(): + """ + Temporary function that configures logging to go straight to console. + """ + formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') + console = logging.StreamHandler(sys.stdout) + console.setLevel(logging.DEBUG) + console.setFormatter(formatter) + root = logging.getLogger() + root.addHandler(console) + root.setLevel(logging.DEBUG) + def configure_for_pokered(config=config): """ Sets default configuration values for pokered. These should eventually be @@ -110,6 +124,7 @@ def get_constants(config=config): class Application(Frame): def __init__(self, master=None, config=config): self.config = config + self.log = logging.getLogger("{0}.{1}".format(self.__class__.__name__, id(self))) self.display_connections = False Frame.__init__(self, master) self.grid() @@ -171,11 +186,11 @@ class Application(Frame): if self.map.blockdata_filename: with open(self.map.blockdata_filename, 'wb') as save: save.write(self.map.blockdata) - print 'blockdata saved as %s' % self.map.blockdata_filename + self.log.info('blockdata saved as {}'.format(self.map.blockdata_filename)) else: - print 'dunno how to save this' + self.log.info('dunno how to save this') else: - print 'nothing to save' + self.log.info('nothing to save') def init_map(self): if hasattr(self, 'map'): @@ -287,6 +302,7 @@ class Map: self.name = name self.config = config + self.log = logging.getLogger("{0}.{1}".format(self.__class__.__name__, id(self))) self.blockdata_filename = blockdata_filename if not self.blockdata_filename and self.name: @@ -380,6 +396,7 @@ class Map: class Tileset: def __init__(self, tileset_id=0, config=config): self.config = config + self.log = logging.getLogger("{0}.{1}".format(self.__class__.__name__, id(self))) self.id = tileset_id @@ -403,10 +420,10 @@ class Tileset: if self.config.version == 'red': tileset_defs = open(os.path.join(self.config.path, 'main.asm'), 'r').read() incbin = asm_at_label(tileset_defs, 'Tset%.2X_GFX' % self.id) - print incbin + self.log.debug(incbin) filename = read_header_macros(incbin, ['filename'], ['INCBIN'])[0][0].replace('"','').replace('.2bpp','.png') filename = os.path.join(self.config.path, filename) - print filename + self.log.debug(filename) if not filename: filename = os.path.join( @@ -702,6 +719,7 @@ def main(config=config): pass if __name__ == "__main__": + setup_logging() config = configure_for_version("crystal", config) get_constants(config=config) main(config=config) -- cgit v1.2.3 From 444d1ecfc721c2a472c7d2a81a8fb68d617a72c2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:41:37 -0600 Subject: also import TclError into map_editor.py --- pokemontools/map_editor.py | 1 + 1 file changed, 1 insertion(+) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 221be2b..1ea0fad 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -13,6 +13,7 @@ from Tkinter import ( LEFT, Y, X, + TclError, ) import ttk -- cgit v1.2.3 From 185a29698e5d3175cecbd779103e1a9838ff0ecc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sun, 17 Nov 2013 19:51:04 -0600 Subject: clean up more imports in map_editor.py --- pokemontools/map_editor.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'pokemontools/map_editor.py') diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 1ea0fad..c30fcd8 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -16,16 +16,23 @@ from Tkinter import ( TclError, ) -import ttk -from ttk import Frame, Style -import PIL -from PIL import Image, ImageTk +from ttk import ( + Frame, + Style, + Combobox, +) -import configuration -config = configuration.Config() +# This is why requirements.txt says to install pillow instead of the original +# PIL. +from PIL import ( + Image, + ImageTk, +) -from preprocessor import separate_comment import gfx +import preprocessor +import configuration +config = configuration.Config() def setup_logging(): """ @@ -163,7 +170,7 @@ class Application(Frame): def get_map_list(self): self.available_maps = sorted(m for m in get_available_maps(config=self.config)) - self.map_list = ttk.Combobox(self.button_frame, height=24, width=24, values=self.available_maps) + self.map_list = Combobox(self.button_frame, height=24, width=24, values=self.available_maps) if len(self.available_maps): self.map_list.set(self.available_maps[0]) @@ -695,7 +702,7 @@ def asm_at_label(asm, label): # go until the next label content = [] for line in lines: - l, comment = separate_comment(line + '\n') + l, comment = preprocessor.separate_comment(line + '\n') if ':' in l: break content += [[l, comment]] -- cgit v1.2.3