From 8caee1e2028a0e03ad3f8f15533b3eea679e6571 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 21 Apr 2024 02:21:30 -0500 Subject: [PATCH 1/5] Allowing seed number to save onto exported yaml if provided by user --- Main.py | 2 ++ source/classes/CustomSettings.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Main.py b/Main.py index 89f10563..c36bad50 100644 --- a/Main.py +++ b/Main.py @@ -413,6 +413,8 @@ def export_yaml(args, fish): logger = logging.getLogger('') world = init_world(args, fish) + if args.seed and int(args.seed) > 0: + world.seed = int(args.seed) from OverworldShuffle import __version__ as ORVersion logger.info( diff --git a/source/classes/CustomSettings.py b/source/classes/CustomSettings.py index fa1f9582..c67d760f 100644 --- a/source/classes/CustomSettings.py +++ b/source/classes/CustomSettings.py @@ -271,6 +271,8 @@ class CustomSettings(object): self.player_range = range(1, world.players + 1) settings_dict, meta_dict = {}, {} self.world_rep['meta'] = meta_dict + if world.seed: + meta_dict['seed'] = world.seed meta_dict['players'] = world.players meta_dict['algorithm'] = world.algorithm meta_dict['race'] = settings.race From 67e2910ad49754488ef9bc44dea59d42aea66aab Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 21 Apr 2024 05:24:26 -0500 Subject: [PATCH 2/5] Fixed issue with outputpath getting changed incorrectly --- source/gui/bottom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/gui/bottom.py b/source/gui/bottom.py index 0eed2689..3b85cc38 100644 --- a/source/gui/bottom.py +++ b/source/gui/bottom.py @@ -172,7 +172,7 @@ def bottom_frame(self, parent, args=None): from tkinter import filedialog filename = filedialog.asksaveasfilename(initialdir=guiargs.outputpath, title="Save file", filetypes=(("Yaml Files", (".yaml", ".yml")), ("All Files", "*"))) if filename is not None and filename != '': - guiargs.outputpath = parent.settings["outputpath"] = os.path.dirname(filename) + guiargs.outputpath = os.path.dirname(filename) guiargs.outputname = os.path.splitext(os.path.basename(filename))[0] export_yaml(args=guiargs, fish=parent.fish) except (FillError, EnemizerError, Exception, RuntimeError) as e: @@ -206,7 +206,9 @@ def bottom_frame(self, parent, args=None): from tkinter import filedialog folder_selected = filedialog.askdirectory() if folder_selected is not None and folder_selected != '': - args.outputpath = parent.settings["outputpath"] = folder_selected + parent.settings["outputpath"] = folder_selected + if args: + args.outputpath = folder_selected ## Output Button widget = "outputdir" From aacde594e943bde017ca86d887431b3954213fc2 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 21 Apr 2024 09:32:59 -0500 Subject: [PATCH 3/5] Fix issue with GUI message showing wrong seed number when yaml specifies a different seed --- source/gui/bottom.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source/gui/bottom.py b/source/gui/bottom.py index 3b85cc38..1c8f838a 100644 --- a/source/gui/bottom.py +++ b/source/gui/bottom.py @@ -106,17 +106,15 @@ def bottom_frame(self, parent, args=None): if guiargs.count is not None and guiargs.seed: seed = guiargs.seed for _ in range(guiargs.count): - seeds.append(seed) - main(seed=seed, args=guiargs, fish=parent.fish) + world = main(seed=seed, args=guiargs, fish=parent.fish) + seeds.append(world.seed) seed = random.randint(0, 999999999) else: - if guiargs.seed: - seeds.append(guiargs.seed) - else: + if not guiargs.seed: random.seed(None) guiargs.seed = random.randint(0, 999999999) - seeds.append(guiargs.seed) - main(seed=guiargs.seed, args=guiargs, fish=parent.fish) + world = main(seed=guiargs.seed, args=guiargs, fish=parent.fish) + seeds.append(world.seed) except (FillError, EnemizerError, Exception, RuntimeError) as e: logging.exception(e) messagebox.showerror(title="Error while creating seed", message=str(e)) From 56c2f8abf71604862c28798222105265c02fb993 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 21 Apr 2024 09:34:02 -0500 Subject: [PATCH 4/5] ROM Fixes Potential fix for bonk items duping OW items Fixed Inverted GT map issue --- Rom.py | 2 +- data/base2current.bps | Bin 132322 -> 132318 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index f12c1a72..b09cb03d 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'ddbecd34e58b7fdf6bed48114b3124d5' +RANDOMIZERBASEHASH = '3147681c6f9f4f84bcf6d9ba1e06a85b' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 2c9e6421407ce9bdd173b2569f8c8fc84b144056..37faa3b9cdaef64d772e5a0dbc9ec792202b9bd9 100644 GIT binary patch delta 11300 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 aX{5oErQ4_fk;Hi%KIh+;6T4I1H~v3nzOHrv delta 11209 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 From 27c82a18dba3b11a490737632a8a8315ca723d6b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 21 Apr 2024 09:37:49 -0500 Subject: [PATCH 5/5] Version bump 0.4.0.2 --- CHANGELOG.md | 4 ++++ OverworldShuffle.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae85449f..b2ee5e85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.4.0.2 +- Fixed issue with Inverted GT entrance not opening +- Potential fox for bonk items duplicating onto other OW items + ## 0.4.0.1 - \~Merged in DR v1.4.1.10~ - Fixed issue with bonk items for MW players diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 7d989686..fa5e536c 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -8,7 +8,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType from OverworldGlitchRules import create_owg_connections from Utils import bidict -version_number = '0.4.0.1' +version_number = '0.4.0.2' # branch indicator is intentionally different across branches version_branch = '-u'