diff --git a/skytemple/controller/settings.py b/skytemple/controller/settings.py index 2bbdd8c28..9b018d395 100644 --- a/skytemple/controller/settings.py +++ b/skytemple/controller/settings.py @@ -222,7 +222,7 @@ def on_setting_help_async_clicked(self, *args): "Synchronous: Asynchronous operations run immediately. The SkyTemple UI freezes briefly during that.\n\n" "GLib: Same has 'Synchronous' but the UI gets the chance to finish displaying loaders etc. " "before they are run.\n\n" - "Using Gbulb event loop: This enables Single-Thread asynchronous loading. It is generally the preferred" + "Using Gbulb event loop: This enables Single-Thread asynchronous loading. It is generally the preferred " "option if available.") ) md.run() diff --git a/skytemple/core/sprite_provider.py b/skytemple/core/sprite_provider.py index 69c65788a..c7b465bc7 100644 --- a/skytemple/core/sprite_provider.py +++ b/skytemple/core/sprite_provider.py @@ -505,7 +505,7 @@ def _load_sprite_from_rom(self, path: str) -> ModelContext[Wan]: def get_loader(self) -> SpriteAndOffsetAndDims: """ - Returns the loader sprite. A "loading" icon with the size ~24x24px. + Returns the loader sprite. A "loading" icon with the size ~24×24px. """ assert self._loader_surface_dims assert self._loader_surface @@ -514,7 +514,7 @@ def get_loader(self) -> SpriteAndOffsetAndDims: def get_error(self) -> SpriteAndOffsetAndDims: """ - Returns the error sprite. An "error" icon with the size ~24x24px. + Returns the error sprite. An "error" icon with the size ~24×24px. """ w, h = self._error_surface_dims return self._error_surface, int(w/2), h, w, h diff --git a/skytemple/module/bgp/controller/bgp.py b/skytemple/module/bgp/controller/bgp.py index da9f0d519..18f78d303 100644 --- a/skytemple/module/bgp/controller/bgp.py +++ b/skytemple/module/bgp/controller/bgp.py @@ -39,10 +39,10 @@ INFO_IMEXPORT_ENTIRE = _("""- The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated).""") logger = logging.getLogger(__name__) diff --git a/skytemple/module/dungeon_graphics/controller/dungeon_bg.py b/skytemple/module/dungeon_graphics/controller/dungeon_bg.py index 07afa080c..47626f06f 100644 --- a/skytemple/module/dungeon_graphics/controller/dungeon_bg.py +++ b/skytemple/module/dungeon_graphics/controller/dungeon_bg.py @@ -40,25 +40,25 @@ from skytemple.module.dungeon_graphics.module import DungeonGraphicsModule -INFO_IMEXPORT_TILES = _("""- The image consists of 8x8 tiles. +INFO_IMEXPORT_TILES = _("""- The image consists of 8×8 tiles. - The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. - The exported palettes are only for your convenience. They are based on the first time the tile is used in a chunk mapping (Chunks > Edit Chunks). -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). """) INFO_IMEXPORT_CHUNK = _("""- The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). Some image editors have problems when working with indexed @@ -68,10 +68,10 @@ INFO_IMEXPORT_ENTIRE = _("""- The images is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). Some image editors have problems when working with indexed diff --git a/skytemple/module/dungeon_graphics/controller/tileset.glade b/skytemple/module/dungeon_graphics/controller/tileset.glade index b9aaf3cc2..4c051a42d 100644 --- a/skytemple/module/dungeon_graphics/controller/tileset.glade +++ b/skytemple/module/dungeon_graphics/controller/tileset.glade @@ -58,16 +58,16 @@ True False This will export all chunks. -Chunks are the 24x24px images that make up the +Chunks are the 24×24px images that make up the graphics of one dungeon tile. -The consist of 3x3 8x8px tiles. +The consist of 3×3 8×8px tiles. You can edit and import the chunks again. Please note the following about the format of the files: - The images are 256-color indexed PNGs. - The 256 colors are divided into 12 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 12 palettes. - The first color in each palette is transparency. @@ -1223,8 +1223,8 @@ be able to re-import the chunks! True False - This will export all tiles. Tiles are 8x8px images. -3x3 tiles can be grouped together to form a chunk, + This will export all tiles. Tiles are 8×8px images. +3×3 tiles can be grouped together to form a chunk, see the "Chunk Editor" for more information. You can edit and import the tiles again. @@ -1232,7 +1232,7 @@ You can edit and import the tiles again. Please note the following about the format of the files: - The images are 256-color indexed PNGs. - The 256 colors are divided into 12 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 12 palettes. - The first color in each palette is transparency. - All tiles are exported with using the colors of palette 0. @@ -2450,11 +2450,11 @@ Use the menus above to edit chunks and tile graphics. The existing mappings are replaced. The file is expected to have the following format: -- The images consists of 3x3 clusters (chunks) of 8x8 tiles. +- The images consists of 3×3 clusters (chunks) of 8×8 tiles. - The images are indexed PNGs. - The colors are divided into 12 16 color palettes (additional colors are ignored). -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 12 palettes. - The first color of each palette will be imported as transparency. @@ -2624,11 +2624,11 @@ Palette animation settings are not changed. This will import the tiles. The file is expected to have the following format: -- The images consists of 8x8 tiles. +- The images consists of 8×8 tiles. - The images are indexed PNGs. - The colors are divided into 12 16 color palettes (additional colors are ignored). -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 12 palettes. - The first color of each palette will be imported as transparency. diff --git a/skytemple/module/lists/controller/iq.glade b/skytemple/module/lists/controller/iq.glade index df4950d12..0321c4f0e 100644 --- a/skytemple/module/lists/controller/iq.glade +++ b/skytemple/module/lists/controller/iq.glade @@ -290,7 +290,7 @@ start 10 If 9999 IQ Points are required, the skill is unused. -If -1 IQ Point is required, the skill is unlocked by default. +If −1 IQ Point is required, the skill is unlocked by default. If two skills have the same restriction group they can not be enabled at the same time. Editing IQ Group assignments requires the 'CompressIQData' patch to be applied. diff --git a/skytemple/module/map_bg/controller/bg.py b/skytemple/module/map_bg/controller/bg.py index 5779ae37e..0744c9cc3 100644 --- a/skytemple/module/map_bg/controller/bg.py +++ b/skytemple/module/map_bg/controller/bg.py @@ -47,24 +47,24 @@ from skytemple.module.map_bg.module import MapBgModule -INFO_IMEXPORT_TILES = _("""- The image consists of 8x8 tiles. +INFO_IMEXPORT_TILES = _("""- The image consists of 8×8 tiles. - The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. - The exported palettes are only for your convenience. They are based on the first time the tile is used in a chunk mapping (Chunks > Edit Chunks). -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). Animated tiles are not imported.""") -INFO_IMEXPORT_CHUNK = _("""- The image consists of 8x8 tiles. +INFO_IMEXPORT_CHUNK = _("""- The image consists of 8×8 tiles. - The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. - Animated tiles are NOT exported or imported. In the export they @@ -72,7 +72,7 @@ animated tiles will be lost, so make sure you note them down to manually re-assign them on import. To change animated tiles, go to Tiles > Animated Tiles. -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). Some image editors have problems when working with indexed @@ -92,11 +92,11 @@ INFO_IMEXPORT_ENTIRE = _("""- The image is a 256-color indexed PNG. - The 256 colors are divided into 16 16 color palettes. -- Each 8x8 tile in the image MUST only use colors from +- Each 8×8 tile in the image MUST only use colors from one of these 16 palettes. - The first color in each palette is transparency. - Animated tiles are exported as static tiles. -- Each import must result in a maximum of 1024 unique 8x8 tiles +- Each import must result in a maximum of 1024 unique 8×8 tiles (=not existing with another palette or flipped or rotated). Some image editors have problems when working with indexed diff --git a/skytemple/module/map_bg/controller/map_bg.glade b/skytemple/module/map_bg/controller/map_bg.glade index 6b45540b8..b6ab21389 100644 --- a/skytemple/module/map_bg/controller/map_bg.glade +++ b/skytemple/module/map_bg/controller/map_bg.glade @@ -2723,7 +2723,7 @@ map must match. Each frame of animated tiles is a separate PNG. The images are expected in the following format: -- The images consists of 8x8 tiles. +- The images consists of 8×8 tiles. - The images are 16-color indexed PNGs. - The first color of each palette will be imported as transparency. @@ -2794,10 +2794,10 @@ the last frame is copied. Exports and imports using a single image. The image is expected in the following format: -- The images consists of 8x8 tiles. +- The image consists of 8×8 tiles. - The rows are the individual tiles. - The columns are the frames of each tile. -- The images are 16-color indexed PNGs. +- The image is a 16-color indexed PNG. - The first color of each palette will be imported as transparency. diff --git a/skytemple/module/misc_graphics/controller/zmappat.py b/skytemple/module/misc_graphics/controller/zmappat.py index 8f8fac03a..4fbd02800 100644 --- a/skytemple/module/misc_graphics/controller/zmappat.py +++ b/skytemple/module/misc_graphics/controller/zmappat.py @@ -147,11 +147,11 @@ def on_minimized_info_clicked(self, *args): MainController.window(), Gtk.DialogFlags.DESTROY_WITH_PARENT, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, - _("The game uses 4x4 'mini-tiles' tiles to render the map.\n" - "However, as the system only uses 8x8 tiles, the game render each 8x8 tile by applying 4 mini-tiles with their respective masks.\n" - "To do this, all mini-tiles have been duplicated to cover the 4 possibilites for placing the mini-tile in 8x8 tiles (top left, top right, bottom left, bottom right).\n" - "The mask is then used to apply the mini-tile only on the correct part of the resulting 8x8 tile.\n" - "The minimized version reduces the tileset to only 4x4 mini-tiles and handles the duplication when importing.\n" + _("The game uses 4×4 'mini-tiles' tiles to render the map.\n" + "However, as the system only uses 8×8 tiles, the game render each 8×8 tile by applying 4 mini-tiles with their respective masks.\n" + "To do this, all mini-tiles have been duplicated to cover the 4 possibilites for placing the mini-tile in 8×8 tiles (top left, top right, bottom left, bottom right).\n" + "The mask is then used to apply the mini-tile only on the correct part of the resulting 8×8 tile.\n" + "The minimized version reduces the tileset to only 4×4 mini-tiles and handles the duplication when importing.\n" "But remember that the full tileset allows more exploits as you can render tiles differently depending on where they are placed."), title=_("Minimized Version Info") ) diff --git a/skytemple/module/portrait/portrait_provider.py b/skytemple/module/portrait/portrait_provider.py index c085a35d8..1f0ff16e2 100644 --- a/skytemple/module/portrait/portrait_provider.py +++ b/skytemple/module/portrait/portrait_provider.py @@ -117,12 +117,12 @@ async def _load__impl(self, entry_id, sub_id, after_load_cb, allow_fallback): def get_loader(self) -> cairo.Surface: """ - Returns the loader sprite. A "loading" icon with the size ~24x24px. + Returns the loader sprite. A "loading" icon with the size ~24×24px. """ return self._loader_surface # type: ignore def get_error(self) -> cairo.Surface: """ - Returns the error sprite. An "error" icon with the size ~24x24px. + Returns the error sprite. An "error" icon with the size ~24×24px. """ return self._error_surface # type: ignore diff --git a/skytemple/module/script/controller/main.py b/skytemple/module/script/controller/main.py index bfc9c8963..b6bd788f6 100644 --- a/skytemple/module/script/controller/main.py +++ b/skytemple/module/script/controller/main.py @@ -125,7 +125,7 @@ def on_cr_weather_edited(self, widget, path, text): def on_btn_add_clicked(self, *args): response, new_name = self._show_generic_input(_('Level Name'), _('Create Level'), (_('If you also need a new background for this level, you can ' - 'create one under "Map Backrgounds" and assign it to this ' + 'create one under "Map Backgrounds" and assign it to this ' 'level afterwards.'))) if response != Gtk.ResponseType.OK: return diff --git a/skytemple/module/tiled_img/dialog_controller/chunk_editor.py b/skytemple/module/tiled_img/dialog_controller/chunk_editor.py index 46d4147fe..7a7f57935 100644 --- a/skytemple/module/tiled_img/dialog_controller/chunk_editor.py +++ b/skytemple/module/tiled_img/dialog_controller/chunk_editor.py @@ -188,7 +188,7 @@ def on_combo_box_palettes_changed(self, wdg: Gtk.ComboBox): self.edited_mappings[self.current_tile_id].pal_idx = wdg.get_active() def on_icon_view_chunk_selection_changed(self, icon_view: IconView): - """Fill the icon view containing the 3x3 tiles for the current chunk""" + """Fill the icon view containing the 3×3 tiles for the current chunk""" model, treeiter = icon_view.get_model(), icon_view.get_selected_items() if model is not None and treeiter is not None and treeiter != []: first_tile_id = model[treeiter][0] @@ -280,7 +280,7 @@ def _init_icon_view_chunk(self): renderer.start() def _init_icon_view_tiles_in_chunk(self): - """Init the icon view containing the 3x3 tiles for the current chunk""" + """Init the icon view containing the 3×3 tiles for the current chunk""" icon_view: IconView = self.builder.get_object(f'icon_view_tiles_in_chunk') icon_view.set_selection_mode(Gtk.SelectionMode.BROWSE) renderer = DrawerTiledCellRenderer( diff --git a/skytemple/module/tiled_img/dialog_controller/palette_editor.py b/skytemple/module/tiled_img/dialog_controller/palette_editor.py index 781e2fcad..6505644fe 100644 --- a/skytemple/module/tiled_img/dialog_controller/palette_editor.py +++ b/skytemple/module/tiled_img/dialog_controller/palette_editor.py @@ -96,7 +96,7 @@ def on_make_unique_info_button_clicked(self, *args): Gtk.ButtonsType.OK, _("Some images editors have problems when editing indexed images that contain\n" "the same color multiple times (they mis-match the actual color index).\n" - "Since the import expects all 8x8 tiles to only use one 16-color palette, this\n" + "Since the import expects all 8×8 tiles to only use one 16-color palette, this\n" "can lead to issues.\n\n" "To solve this, you can make all colors in the palettes unique. This is done by\n" "slightly shifting the color values of duplicate colors (not visible for the\n" diff --git a/skytemple/module/tiled_img/drawer_tiled.py b/skytemple/module/tiled_img/drawer_tiled.py index f073fe32a..21c703014 100644 --- a/skytemple/module/tiled_img/drawer_tiled.py +++ b/skytemple/module/tiled_img/drawer_tiled.py @@ -47,7 +47,7 @@ def __init__( """ :param draw_area: Widget to draw on - :param tile_mappings: Either one tile or 3x3 tiles to draw. Can also be set later + :param tile_mappings: Either one tile or 3×3 tiles to draw. Can also be set later :param bpa_durations: :param tile_surfaces: List of all surfaces """ @@ -76,7 +76,7 @@ def set_tile_mappings(self, tile_mappings: List[TilemapEntry]): self.width = BPC_TILE_DIM * self.tiling_width self.height = BPC_TILE_DIM * self.tiling_height else: - raise ValueError(_("Only 1x1 or 3x3 supported.")) + raise ValueError(_("Only 1×1 or 3×3 supported.")) def start(self): """Start drawing on the DrawingArea""" diff --git a/skytemple/skytemple.glade b/skytemple/skytemple.glade index d6ea77041..bf4a2eccb 100644 --- a/skytemple/skytemple.glade +++ b/skytemple/skytemple.glade @@ -2167,7 +2167,7 @@ Developer of ppmdu. This tool converts any image into the image format required by Explorers of Sky. Please note that the game has pretty strict color restrictions. -Each 8x8 tile will only be able to use one palette. +Each 8×8 tile will only be able to use one palette. The images created by this tool can be imported for backgrounds.