morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add sprite pool options to gui/adjuster

Browse Source
This commit is contained in:
CaitSith2
2021-03-27 07:12:08 -07:00
parent 25f234dff0
commit df0b98975d
4 changed files with 109 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Utils.py
View File

@@ -334,6 +334,7 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
import Patch
adjuster_settings.rom = romfile
adjuster_settings.baserom = Patch.get_base_rom_path()
adjuster_settings.world = None
whitelist = {"disablemusic", "fastmenu", "heartbeep", "heartcolor", "ow_palettes", "quickswap",
"uw_palettes", "sprite"}
printed_options = {name: value for name, value in vars(adjuster_settings).items() if name in whitelist}
@@ -347,9 +348,16 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
f"{pprint.pformat(printed_options)}\n"
f"Enter yes, no or never: ")
if adjust_wanted and adjust_wanted.startswith("y"):
if hasattr(adjuster_settings, "sprite_pool"):
from Adjuster import AdjusterWorld
adjuster_settings.world = AdjusterWorld(getattr(adjuster_settings, "sprite_pool"))
adjusted = True
import Adjuster
_, romfile = Adjuster.adjust(adjuster_settings)
if hasattr(adjuster_settings, "world"):
delattr(adjuster_settings, "world")
elif adjust_wanted and "never" in adjust_wanted:
persistent_store("adjuster", "never_adjust", True)
return romfile, False