From 4717449c354226d39744015767132499f2a24c18 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 24 Feb 2022 10:10:51 -0700 Subject: [PATCH] Used create rom flag to indicate if sfc file should be generated or not --- Main.py | 6 +++--- RELEASENOTES.md | 5 ++++- resources/app/gui/randomize/generation/checkboxes.json | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 38d82b87..d73d2247 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.1.6-v' +__version__ = '1.0.1.7-v' from source.classes.BabelFish import BabelFish @@ -261,7 +261,7 @@ def main(args, seed=None, fish=None): rom_names = [] jsonout = {} enemized = False - if not args.suppress_rom: + if not args.suppress_rom or args.bps: logger.info(world.fish.translate("cli","cli","patching.rom")) for team in range(world.teams): for player in range(1, world.players + 1): @@ -314,7 +314,7 @@ def main(args, seed=None, fish=None): patch = create_bps_from_data(LocalRom(args.rom, patch=False).buffer, rom.buffer) with open(patchfile, 'wb') as stream: stream.write(patch.binary_ba) - else: + if not args.suppress_rom: sfc_file = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.sfc') rom.write_to_file(sfc_file) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0d7b369f..5a3d5a85 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -8,7 +8,7 @@ New pottery option that control which pots (and large blocks) are in the locatio * None: No pots are in the pool, like normal randomizer * Key Pots: The pots that have keys are in the pool. This is about half of the old keydropshuffle option -* Cave Pots: The pots that are not found in dungeon are in the pool. (Includes the large block in Spike Cave). Does +* Cave Pots: The pots that are not found in dungeons are in the pool. (Includes the large block in Spike Cave). Does not include key pots. * Dungeon Pots: The pots that are in dungeons are in the pool. (Includes serveral large blocks) * Lottery: All pots and large blocks are in the pool @@ -147,6 +147,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.1.7 + * Allow creation of BPS and SFC files (no longer mutually exclusive) + * Fixed usestartinventory flag (can be use on a per player basis) * 1.0.1.6 * A couple new options for lighter pottery modes (Cave Pots and Dungeon Pots) * New option for Boss Shuffle: Unique (Prize bosses will be one of each, but GT bosses can be anything) diff --git a/resources/app/gui/randomize/generation/checkboxes.json b/resources/app/gui/randomize/generation/checkboxes.json index a5e4511c..ef37e0c1 100644 --- a/resources/app/gui/randomize/generation/checkboxes.json +++ b/resources/app/gui/randomize/generation/checkboxes.json @@ -1,8 +1,8 @@ { "checkboxes": { + "createrom": { "type": "checkbox" }, "bps": { "type": "checkbox" }, "createspoiler": { "type": "checkbox" }, - "createrom": { "type": "checkbox" }, "calcplaythrough": { "type": "checkbox" }, "usestartinventory": { "type": "checkbox" }, "usecustompool": { "type": "checkbox" }