alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Saves sprite settings

Browse Source 
Save on exit feature
Some formatting changes
This commit is contained in:
aerinon
2020-03-02 15:04:46 -07:00
parent a20f5423fd
commit 8bdbf5d6b2
5 changed files with 213 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
CLI.py
View File

@@ -9,7 +9,6 @@ import shlex
import sys import sys
from Main import main from Main import main
from Rom import get_sprite_from_name
from Utils import is_bundled, close_console from Utils import is_bundled, close_console
from Fill import FillError from Fill import FillError
@@ -264,7 +263,7 @@ def parse_arguments(argv, no_defaults=False):
help='Select the color of Link\'s heart meter. (default: %(default)s)') help='Select the color of Link\'s heart meter. (default: %(default)s)')
parser.add_argument('--ow_palettes', default=defval(settings["ow_palettes"]), choices=['default', 'random', 'blackout']) parser.add_argument('--ow_palettes', default=defval(settings["ow_palettes"]), choices=['default', 'random', 'blackout'])
parser.add_argument('--uw_palettes', default=defval(settings["uw_palettes"]), choices=['default', 'random', 'blackout']) parser.add_argument('--uw_palettes', default=defval(settings["uw_palettes"]), choices=['default', 'random', 'blackout'])
parser.add_argument('--sprite', help='''\ parser.add_argument('--sprite', default=defval(settings["sprite"]), help='''\
Path to a sprite sheet to use for Link. Needs to be in Path to a sprite sheet to use for Link. Needs to be in
binary format and have a length of 0x7000 (28672) bytes, binary format and have a length of 0x7000 (28672) bytes,
or 0x7078 (28792) bytes including palette data. or 0x7078 (28792) bytes including palette data.
@@ -291,6 +290,7 @@ def parse_arguments(argv, no_defaults=False):
parser.add_argument('--teams', default=defval(1), type=lambda value: max(int(value), 1)) parser.add_argument('--teams', default=defval(1), type=lambda value: max(int(value), 1))
parser.add_argument('--outputpath', default=defval(settings["outputpath"])) parser.add_argument('--outputpath', default=defval(settings["outputpath"]))
parser.add_argument('--race', default=defval(settings["race"] != 0), action='store_true') parser.add_argument('--race', default=defval(settings["race"] != 0), action='store_true')
parser.add_argument('--saveonexit', default=defval(settings["saveonexit"]), choices=['never', 'ask', 'always'])
parser.add_argument('--outputname') parser.add_argument('--outputname')
if multiargs.multi: if multiargs.multi:
@@ -322,185 +322,187 @@ def parse_arguments(argv, no_defaults=False):
return ret return ret
def get_settings(): def get_settings():
# set default settings # set default settings
settings = { settings = {
"retro": False, "retro": False,
"mode": "open", "mode": "open",
"logic": "noglitches", "logic": "noglitches",
"goal": "ganon", "goal": "ganon",
"crystals_gt": "7", "crystals_gt": "7",
"crystals_ganon": "7", "crystals_ganon": "7",
"swords": "random", "swords": "random",
"difficulty": "normal", "difficulty": "normal",
"item_functionality": "normal", "item_functionality": "normal",
"timer": "none", "timer": "none",
"progressive": "on", "progressive": "on",
"accessibility": "items", "accessibility": "items",
"algorithm": "balanced", "algorithm": "balanced",
"openpyramid": False, "openpyramid": False,
"shuffleganon": False, "shuffleganon": False,
"shuffle": "vanilla", "shuffle": "vanilla",
"shufflepots": False, "shufflepots": False,
"shuffleenemies": "none", "shuffleenemies": "none",
"shufflebosses": "none", "shufflebosses": "none",
"enemy_damage": "default", "enemy_damage": "default",
"enemy_health": "default", "enemy_health": "default",
"enemizercli": os.path.join(".","EnemizerCLI","EnemizerCLI.Core"), "enemizercli": os.path.join(".", "EnemizerCLI", "EnemizerCLI.Core"),
"mapshuffle": False, "mapshuffle": False,
"compassshuffle": False, "compassshuffle": False,
"keyshuffle": False, "keyshuffle": False,
"bigkeyshuffle": False, "bigkeyshuffle": False,
"keysanity": False, "keysanity": False,
"door_shuffle": "basic", "door_shuffle": "basic",
"experimental": 0, "experimental": 0,
"dungeon_counters": "off", "dungeon_counters": "off",
"multi": 1, "multi": 1,
"names": "", "names": "",
"hints": True, "hints": True,
"disablemusic": False, "disablemusic": False,
"quickswap": False, "quickswap": False,
"heartcolor": "red", "heartcolor": "red",
"heartbeep": "normal", "heartbeep": "normal",
"sprite": None, "sprite": None,
"fastmenu": "normal", "fastmenu": "normal",
"ow_palettes": "default", "ow_palettes": "default",
"uw_palettes": "default", "uw_palettes": "default",
"create_spoiler": False, "create_spoiler": False,
"skip_playthrough": False, "skip_playthrough": False,
"suppress_rom": False, "suppress_rom": False,
"usestartinventory": False, "usestartinventory": False,
"custom": False, "custom": False,
"rom": os.path.join(".","Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"), "rom": os.path.join(".", "Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"),
"seed": None, "seed": None,
"count": 1, "count": 1,
"startinventory": "", "startinventory": "",
"beemizer": 0, "beemizer": 0,
"remote_items": False, "remote_items": False,
"race": False, "race": False,
"customitemarray": { "customitemarray": {
"bow": 0, "bow": 0,
"progressivebow": 2, "progressivebow": 2,
"boomerang": 1, "boomerang": 1,
"redmerang": 1, "redmerang": 1,
"hookshot": 1, "hookshot": 1,
"mushroom": 1, "mushroom": 1,
"powder": 1, "powder": 1,
"firerod": 1, "firerod": 1,
"icerod": 1, "icerod": 1,
"bombos": 1, "bombos": 1,
"ether": 1, "ether": 1,
"quake": 1, "quake": 1,
"lamp": 1, "lamp": 1,
"hammer": 1, "hammer": 1,
"shovel": 1, "shovel": 1,
"flute": 1, "flute": 1,
"bugnet": 1, "bugnet": 1,
"book": 1, "book": 1,
"bottle": 4, "bottle": 4,
"somaria": 1, "somaria": 1,
"byrna": 1, "byrna": 1,
"cape": 1, "cape": 1,
"mirror": 1, "mirror": 1,
"boots": 1, "boots": 1,
"powerglove": 0, "powerglove": 0,
"titansmitt": 0, "titansmitt": 0,
"progressiveglove": 2, "progressiveglove": 2,
"flippers": 1, "flippers": 1,
"pearl": 1, "pearl": 1,
"heartpiece": 24, "heartpiece": 24,
"heartcontainer": 10, "heartcontainer": 10,
"sancheart": 1, "sancheart": 1,
"sword1": 0, "sword1": 0,
"sword2": 0, "sword2": 0,
"sword3": 0, "sword3": 0,
"sword4": 0, "sword4": 0,
"progressivesword": 4, "progressivesword": 4,
"shield1": 0, "shield1": 0,
"shield2": 0, "shield2": 0,
"shield3": 0, "shield3": 0,
"progressiveshield": 3, "progressiveshield": 3,
"mail2": 0, "mail2": 0,
"mail3": 0, "mail3": 0,
"progressivemail": 2, "progressivemail": 2,
"halfmagic": 1, "halfmagic": 1,
"quartermagic": 0, "quartermagic": 0,
"bombsplus5": 0, "bombsplus5": 0,
"bombsplus10": 0, "bombsplus10": 0,
"arrowsplus5": 0, "arrowsplus5": 0,
"arrowsplus10": 0, "arrowsplus10": 0,
"arrow1": 1, "arrow1": 1,
"arrow10": 12, "arrow10": 12,
"bomb1": 0, "bomb1": 0,
"bomb3": 16, "bomb3": 16,
"bomb10": 1, "bomb10": 1,
"rupee1": 2, "rupee1": 2,
"rupee5": 4, "rupee5": 4,
"rupee20": 28, "rupee20": 28,
"rupee50": 7, "rupee50": 7,
"rupee100": 1, "rupee100": 1,
"rupee300": 5, "rupee300": 5,
"blueclock": 0, "blueclock": 0,
"greenclock": 0, "greenclock": 0,
"redclock": 0, "redclock": 0,
"silversupgrade": 0, "silversupgrade": 0,
"generickeys": 0, "generickeys": 0,
"triforcepieces": 0, "triforcepieces": 0,
"triforcepiecesgoal": 0, "triforcepiecesgoal": 0,
"triforce": 0, "triforce": 0,
"rupoor": 0, "rupoor": 0,
"rupoorcost": 10 "rupoorcost": 10
}, },
"randomSprite": False, "randomSprite": False,
"outputpath": os.path.join(".") "outputpath": os.path.join("."),
} "saveonexit": "ask",
settings["startinventoryarray"] = {} "startinventoryarray": {}
if sys.platform.lower().find("windows"): }
settings["enemizercli"] += ".exe"
if sys.platform.lower().find("windows"):
settings["enemizercli"] += ".exe"
# read saved settings file if it exists and set these
settings_path = os.path.join(".", "resources", "user", "settings.json")
if os.path.exists(settings_path):
with(open(settings_path)) as json_file:
data = json.load(json_file)
for k, v in data.items():
settings[k] = v
return settings
# read saved settings file if it exists and set these
settings_path = os.path.join(".", "resources", "user", "settings.json")
if os.path.exists(settings_path):
with(open(settings_path)) as json_file:
data = json.load(json_file)
if 'sprite' in data.keys() and data['sprite']:
data['sprite'] = get_sprite_from_name(data['sprite'])
for k,v in data.items():
settings[k] = v
return settings
def get_args_priority(settings_args, gui_args, cli_args): def get_args_priority(settings_args, gui_args, cli_args):
args = {} args = {}
args["settings"] = get_settings() if settings_args is None else settings_args args["settings"] = get_settings() if settings_args is None else settings_args
args["gui"] = {} if gui_args is None else gui_args args["gui"] = {} if gui_args is None else gui_args
args["cli"] = cli_args args["cli"] = cli_args
args["load"] = args["settings"] args["load"] = args["settings"]
if args["gui"] is not None: if args["gui"] is not None:
for k in args["gui"]: for k in args["gui"]:
if k not in args["load"] or args["load"][k] != args["gui"]: if k not in args["load"] or args["load"][k] != args["gui"]:
args["load"][k] = args["gui"][k] args["load"][k] = args["gui"][k]
if args["cli"] is None: if args["cli"] is None:
args["cli"] = {} args["cli"] = {}
cli = vars(parse_arguments(None)) cli = vars(parse_arguments(None))
for k,v in cli.items(): for k, v in cli.items():
if isinstance(v,dict) and 1 in v: if isinstance(v, dict) and 1 in v:
args["cli"][k] = v[1] args["cli"][k] = v[1]
else: else:
args["cli"][k] = v args["cli"][k] = v
load_doesnt_have_key = k not in args["load"] load_doesnt_have_key = k not in args["load"]
different_val = (k in args["load"] and k in args["cli"]) and (args["load"][k] != args["cli"][k]) different_val = (k in args["load"] and k in args["cli"]) and (args["load"][k] != args["cli"][k])
cli_has_empty_dict = k in args["cli"] and isinstance(args["cli"][k],dict) and len(args["cli"][k]) == 0 cli_has_empty_dict = k in args["cli"] and isinstance(args["cli"][k], dict) and len(args["cli"][k]) == 0
if load_doesnt_have_key or different_val: if load_doesnt_have_key or different_val:
if not cli_has_empty_dict: if not cli_has_empty_dict:
args["load"][k] = args["cli"][k] args["load"][k] = args["cli"][k]
return args return args

23
Gui.py
View File

@@ -21,7 +21,6 @@ from gui.randomize.generation import generation_page
from gui.bottom import bottom_frame, create_guiargs from gui.bottom import bottom_frame, create_guiargs
from GuiUtils import set_icon from GuiUtils import set_icon
from Main import __version__ as ESVersion from Main import __version__ as ESVersion
from Rom import get_sprite_from_name
def guiMain(args=None): def guiMain(args=None):
@@ -36,21 +35,29 @@ def guiMain(args=None):
f.write(json.dumps(args, indent=2)) f.write(json.dumps(args, indent=2))
os.chmod(os.path.join(settings_path, "settings.json"),0o755) os.chmod(os.path.join(settings_path, "settings.json"),0o755)
def save_settings_from_gui(): def save_settings_from_gui(confirm):
gui_args = vars(create_guiargs(self)) gui_args = vars(create_guiargs(self))
if self.randomSprite.get(): if self.randomSprite.get():
gui_args['sprite'] = 'random' gui_args['sprite'] = 'random'
elif gui_args['sprite']: elif gui_args['sprite']:
gui_args['sprite'] = gui_args['sprite'].name gui_args['sprite'] = gui_args['sprite'].name
save_settings(gui_args) save_settings(gui_args)
messagebox.showinfo("Door Shuffle " + ESVersion,"Settings saved from GUI.") if confirm:
messagebox.showinfo("Door Shuffle " + ESVersion, "Settings saved from GUI.")
# routine for exiting the app # routine for exiting the app
def guiExit(): def guiExit():
dosave = messagebox.askyesno("Door Shuffle " + ESVersion, "Save settings before exit?") skip_exit = False
if dosave: if self.settings['saveonexit'] == 'ask':
save_settings_from_gui() dosave = messagebox.askyesnocancel("Door Shuffle " + ESVersion, "Save settings before exit?")
sys.exit(0) if dosave:
save_settings_from_gui(True)
if dosave is None:
skip_exit = True
elif self.settings['saveonexit'] == 'always':
save_settings_from_gui(False)
if not skip_exit:
sys.exit(0)
# make main window # make main window
# add program title & version number # add program title & version number
@@ -137,7 +144,7 @@ def guiMain(args=None):
# bottom of window: Open Output Directory, Open Documentation (if exists) # bottom of window: Open Output Directory, Open Documentation (if exists)
self.frames["bottom"] = bottom_frame(self, self, None) self.frames["bottom"] = bottom_frame(self, self, None)
## Save Settings Button ## Save Settings Button
savesettingsButton = Button(self.frames["bottom"], text='Save Settings to File', command=save_settings_from_gui) savesettingsButton = Button(self.frames["bottom"], text='Save Settings to File', command=lambda: save_settings_from_gui(True))
savesettingsButton.pack(side=RIGHT) savesettingsButton.pack(side=RIGHT)
# set bottom frame to main window # set bottom frame to main window

3
classes/constants.py
View File

@@ -102,7 +102,8 @@ SETTINGSTOPROCESS = {
"spoiler": "create_spoiler", "spoiler": "create_spoiler",
"suppressrom": "suppress_rom", "suppressrom": "suppress_rom",
"usestartinventory": "usestartinventory", "usestartinventory": "usestartinventory",
"usecustompool": "custom" "usecustompool": "custom",
"saveonexit": "saveonexit"
} }
} }
} }

12
gui/loadcliargs.py
View File

@@ -1,6 +1,6 @@
from classes.SpriteSelector import SpriteSelector as spriteSelector from classes.SpriteSelector import SpriteSelector as spriteSelector
from gui.randomize.gameoptions import set_sprite from gui.randomize.gameoptions import set_sprite
from Rom import Sprite from Rom import Sprite, get_sprite_from_name
import classes.constants as CONST import classes.constants as CONST
def loadcliargs(gui, args, settings=None): def loadcliargs(gui, args, settings=None):
@@ -39,18 +39,16 @@ def loadcliargs(gui, args, settings=None):
def sprite_setter(spriteObject): def sprite_setter(spriteObject):
gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = spriteObject gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = spriteObject
if args["sprite"] is not None: if args["sprite"] is not None:
sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else Sprite(args["sprite"]) sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else get_sprite_from_name(args["sprite"])
r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False set_sprite(sprite_obj, False, spriteSetter=sprite_setter,
set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter,
spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"], spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"],
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)
def sprite_setter_adj(spriteObject): def sprite_setter_adj(spriteObject):
gui.pages["adjust"].content.sprite = spriteObject gui.pages["adjust"].content.sprite = spriteObject
if args["sprite"] is not None: if args["sprite"] is not None:
sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite) sprite_obj = args.sprite if isinstance(args["sprite"], Sprite) else get_sprite_from_name(args["sprite"])
r_sprite_flag = args["randomSprite"] if hasattr(args, 'randomSprite') else False set_sprite(sprite_obj, False, spriteSetter=sprite_setter_adj,
set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj,
spriteNameVar=gui.pages["adjust"].content.spriteNameVar2, spriteNameVar=gui.pages["adjust"].content.spriteNameVar2,
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)

19
resources/app/gui/randomize/generation/checkboxes.json
View File

@@ -22,5 +22,24 @@
"label": { "label": {
"text": "Use custom item pool" "text": "Use custom item pool"
} }
},
"saveonexit": {
"type": "selectbox",
"label": {
"text": "Save Settings on Exit"
},
"managerAttrs": {
"label": {
"side": "left"
},
"selectbox": {
"side": "right"
}
},
"options": {
"Ask Me": "ask",
"Always": "always",
"Never": "never"
}
} }
} }