Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add: --no-32bpp and --no-extra-zoom option to skip some alternative sprites #286

Merged
merged 1 commit into from
May 21, 2023
Merged

Add: --no-32bpp and --no-extra-zoom option to skip some alternative sprites #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion nml/ast/alt_sprites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
"ZOOM_LEVEL_OUT_4X": 4,
"ZOOM_LEVEL_OUT_8X": 5,
}
allow_extra_zoom = True

bit_depths = {"BIT_DEPTH_8BPP": 8, "BIT_DEPTH_32BPP": 32.0}
allow_32bpp = True


class AltSpritesBlock(base_statement.BaseStatement):
Expand Down Expand Up @@ -86,7 +88,7 @@ def __init__(self, param_list, sprite_list, pos):
)
global any_32bpp_sprites
if self.bit_depth == 32:
any_32bpp_sprites = True
any_32bpp_sprites = allow_32bpp

if len(param_list) >= 4:
self.image_file = param_list[3].reduce()
Expand All @@ -111,6 +113,8 @@ def __init__(self, param_list, sprite_list, pos):
self.sprite_list = sprite_list

def pre_process(self):
if (self.bit_depth == 32 and not allow_32bpp) or (self.zoom_level != 0 and not allow_extra_zoom):
return
block = sprite_container.SpriteContainer.resolve_sprite_block(self.name)
block.add_sprite_data(
self.sprite_list, self.image_file, self.pos, self.zoom_level, self.bit_depth, self.mask_file
Expand Down
8 changes: 8 additions & 0 deletions nml/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ def parse_cli(argv):
verbosity=generic.verbosity_level,
rebuild_parser=False,
debug_parser=False,
allow_extra_zoom=True,
allow_32bpp=True,
)
opt_parser.add_option("-d", "--debug", action="store_true", dest="debug", help="write the AST to stdout")
opt_parser.add_option("-s", "--stack", action="store_true", dest="stack", help="Dump stack when an error occurs")
Expand Down Expand Up @@ -218,13 +220,19 @@ def parse_cli(argv):
const=generic.Warning.DEPRECATION,
help="Disable deprecation warnings",
)
opt_parser.add_option(
"--no-extra-zoom", action="store_false", dest="allow_extra_zoom", help="Skip extra zoom alternative sprites"
)
opt_parser.add_option("--no-32bpp", action="store_false", dest="allow_32bpp", help="Skip 32bpp alternative sprites")

opts, args = opt_parser.parse_args(argv)

generic.set_verbosity(0 if opts.quiet else opts.verbosity)
generic.Warning.disabled = opts.disable_warning
generic.set_cache_root_dir(None if opts.no_cache else opts.cache_dir)
spritecache.keep_orphaned = opts.keep_orphaned
alt_sprites.allow_extra_zoom = opts.allow_extra_zoom
alt_sprites.allow_32bpp = opts.allow_32bpp

opts.outputfile_given = (
opts.grf_filename or opts.nfo_filename or opts.nml_filename or opts.dep_filename or opts.outputs
Expand Down