monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show universal keys in non-mystery filename when rolled from gui or command line.

This commit is contained in:
CaitSith2 2020-09-02 15:06:36 -07:00
parent e77cd7c38a
commit 9d9a13dd1d
1 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Main.py
View File

@ -205,33 +205,58 @@ def main(args, seed=None):
mcsb_name = '-keysanity' mcsb_name = '-keysanity'
elif [world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], elif [world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player],
world.bigkeyshuffle[player]].count(True) == 1: world.bigkeyshuffle[player]].count(True) == 1:
mcsb_name = '-mapshuffle' if world.mapshuffle[player] else '-compassshuffle' if world.compassshuffle[ mcsb_name = '-mapshuffle' if world.mapshuffle[player] else \
player] else '-keyshuffle' if world.keyshuffle[player] else '-bigkeyshuffle' '-compassshuffle' if world.compassshuffle[player] else \
'-universal_keys' if world.keyshuffle[player] == "universal" else \
'-keyshuffle' if world.keyshuffle[player] else '-bigkeyshuffle'
elif any([world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player], elif any([world.mapshuffle[player], world.compassshuffle[player], world.keyshuffle[player],
world.bigkeyshuffle[player]]): world.bigkeyshuffle[player]]):
mcsb_name = '-%s%s%s%sshuffle' % ( mcsb_name = '-%s%s%s%sshuffle' % (
'M' if world.mapshuffle[player] else '', 'C' if world.compassshuffle[player] else '', 'M' if world.mapshuffle[player] else '', 'C' if world.compassshuffle[player] else '',
'S' if world.keyshuffle[player] else '', 'B' if world.bigkeyshuffle[player] else '') 'U' if world.keyshuffle[player] == "universal" else 'S' if world.keyshuffle[player] else '',
'B' if world.bigkeyshuffle[player] else '')
outfilepname = f'_T{team + 1}' if world.teams > 1 else '' outfilepname = f'_T{team + 1}' if world.teams > 1 else ''
outfilepname += f'_P{player}' outfilepname += f'_P{player}'
outfilepname += f"_{world.player_names[player][team].replace(' ', '_')}" if world.player_names[player][ outfilepname += f"_{world.player_names[player][team].replace(' ', '_')}" \
team] != 'Player%d' % player else '' if world.player_names[player][team] != 'Player%d' % player else ''
outfilesuffix = ('_%s_%s-%s-%s-%s%s_%s-%s%s%s%s%s' % (world.logic[player], world.difficulty[player], outfilestuffs = {
world.difficulty_adjustments[player], "logic": world.logic[player], # 0
world.mode[player], world.goal[player], "difficulty": world.difficulty[player], # 1
"" if world.timer[player] in [False, "difficulty_adjustments": world.difficulty_adjustments[player], # 2
'display'] else "-" + "mode": world.mode[player], # 3
world.timer[ "goal": world.goal[player], # 4
player], "timer": str(world.timer[player]), # 5
world.shuffle[player], world.algorithm, "shuffle": world.shuffle[player], # 6
mcsb_name, "algorithm": world.algorithm, # 7
"-retro" if world.retro[player] else "", "mscb": mcsb_name, # 8
"-prog_" + world.progressive[player] if "retro": world.retro[player], # 9
world.progressive[player] in ['off', "progressive": world.progressive, # A
'random'] else "", "hints": 'True' if world.hints[player] else 'False' # B
"-nohints" if not world.hints[ }
player] else "")) if not args.outputname else '' # 0 1 2 3 4 5 6 7 8 9 A B
outfilesuffix = ('_%s_%s-%s-%s-%s%s_%s-%s%s%s%s%s' % (
# 0 1 2 3 4 5 6 7 8 9 A B C
# _noglitches_normal-normal-open-ganon-ohko_simple-balanced-keysanity-retro-prog_random-nohints
# _noglitches_normal-normal-open-ganon _simple-balanced-keysanity-retro
# _noglitches_normal-normal-open-ganon _simple-balanced-keysanity -prog_random
# _noglitches_normal-normal-open-ganon _simple-balanced-keysanity -nohints
outfilestuffs["logic"], # 0
outfilestuffs["difficulty"], # 1
outfilestuffs["difficulty_adjustments"], # 2
outfilestuffs["mode"], # 3
outfilestuffs["goal"], # 4
"" if outfilestuffs["timer"] in ['False', 'none', 'display'] else "-" + outfilestuffs["timer"], # 5
outfilestuffs["shuffle"], # 6
outfilestuffs["algorithm"], # 7
outfilestuffs["mscb"], # 8
"-retro" if outfilestuffs["retro"] == "True" else "", # 9
"-prog_" + outfilestuffs["progressive"] if outfilestuffs["progressive"] in ['off', 'random'] else "", # A
"-nohints" if not outfilestuffs["hints"] == "True" else "") # B
) if not args.outputname else ''
rompath = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc') rompath = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc')
rom.write_to_file(rompath, hide_enemizer=True) rom.write_to_file(rompath, hide_enemizer=True)
if args.create_diff: if args.create_diff: