From e8fd575379269e71e655c027d95d638cb8a98cd5 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 29 Dec 2020 19:59:20 +0100 Subject: [PATCH] tile_shuffle option no longer requires Enemizer, document it as such also shuffle things around in gui.py --- Gui.py | 54 +++++++++++++++++++++++---------------------- Utils.py | 2 +- playerSettings.yaml | 6 ++--- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Gui.py b/Gui.py index 9dc00d6a..514bae56 100755 --- a/Gui.py +++ b/Gui.py @@ -97,12 +97,9 @@ def guiMain(args=None): hintsVar.set(1) # set default hintsCheckbutton = Checkbutton(checkBoxFrame, text="Include Helpful Hints", variable=hintsVar) - balancingVar = IntVar() - balancingVar.set(1) # set default - balancingCheckbutton = Checkbutton(checkBoxFrame, text="Multiworld Progression Balancing", variable=balancingVar) - patchesVar = IntVar() - patchesVar.set(1) # set default - patchesCheckbutton = Checkbutton(checkBoxFrame, text="Create Delta Patches", variable=patchesVar) + tileShuffleVar = IntVar() + tileShuffleButton = Checkbutton(checkBoxFrame, text="Tile shuffle", variable=tileShuffleVar) + createSpoilerCheckbutton.pack(expand=True, anchor=W) suppressRomCheckbutton.pack(expand=True, anchor=W) openpyramidCheckbutton.pack(expand=True, anchor=W) @@ -115,9 +112,7 @@ def guiMain(args=None): retroCheckbutton.pack(expand=True, anchor=W) shuffleGanonCheckbutton.pack(expand=True, anchor=W) hintsCheckbutton.pack(expand=True, anchor=W) - - balancingCheckbutton.pack(expand=True, anchor=W) - patchesCheckbutton.pack(expand=True, anchor=W) + tileShuffleButton.pack(expand=True, anchor=W) romOptionsFrame = LabelFrame(rightHalfFrame, text="Rom options") @@ -471,17 +466,13 @@ def guiMain(args=None): potShuffleButton = Checkbutton(enemizerFrame, text="Pot shuffle", variable=potShuffleVar) potShuffleButton.grid(row=2, column=0, sticky=W) - tileShuffleVar = IntVar() - tileShuffleButton = Checkbutton(enemizerFrame, text="Tile shuffle", variable=tileShuffleVar) - tileShuffleButton.grid(row=2, column=1, sticky=W) - bushShuffleVar = IntVar() bushShuffleButton = Checkbutton(enemizerFrame, text="Bush shuffle", variable=bushShuffleVar) - bushShuffleButton.grid(row=2, column=2, sticky=W) + bushShuffleButton.grid(row=2, column=1, sticky=W) killableThievesVar = IntVar() killable_thievesShuffleButton = Checkbutton(enemizerFrame, text="Killable Thieves", variable=killableThievesVar) - killable_thievesShuffleButton.grid(row=2, column=3, sticky=W) + killable_thievesShuffleButton.grid(row=2, column=2, sticky=W) shopframe = LabelFrame(randomizerWindow, text="Shops", padx=5, pady=2) @@ -499,7 +490,7 @@ def guiMain(args=None): multiworldframe = LabelFrame(randomizerWindow, text="Multiworld", padx=5, pady=2) - worldLabel = Label(multiworldframe, text='Worlds') + worldLabel = Label(multiworldframe, text='Players per Team') worldVar = StringVar() worldSpinbox = Spinbox(multiworldframe, from_=1, to=255, width=5, textvariable=worldVar) namesLabel = Label(multiworldframe, text='Player names') @@ -508,10 +499,17 @@ def guiMain(args=None): seedLabel = Label(multiworldframe, text='Seed #') seedVar = StringVar() seedEntry = Entry(multiworldframe, width=20, textvariable=seedVar) - countLabel = Label(multiworldframe, text='Count') + countLabel = Label(multiworldframe, text='Amount of Multiworlds') countVar = StringVar() countSpinbox = Spinbox(multiworldframe, from_=1, to=100, width=5, textvariable=countVar) + balancingVar = IntVar() + balancingVar.set(1) # set default + balancingCheckbutton = Checkbutton(multiworldframe, text="Progression Balancing", variable=balancingVar) + patchesVar = IntVar() + patchesVar.set(1) # set default + patchesCheckbutton = Checkbutton(multiworldframe, text="Create Delta Patches", variable=patchesVar) + def generateRom(): guiargs = Namespace() guiargs.multi = int(worldVar.get()) @@ -643,16 +641,20 @@ def guiMain(args=None): else: messagebox.showinfo(title="Success", message="Multiworld created successfully") - generateButton = Button(farBottomFrame, text='Generate Patched Rom', command=generateRom) + generateButton = Button(farBottomFrame, text='Generate Multiworld', command=generateRom) + + worldLabel.grid(row=0, column=0, sticky=W) + worldSpinbox.grid(row=0, column=1, sticky=W) + namesLabel.grid(row=0, column=2, sticky=W) + namesEntry.grid(row=0, column=3, sticky=W + E) + multiworldframe.grid_columnconfigure(3, weight=1) # stretch name field + seedLabel.grid(row=0, column=4, sticky=W) + seedEntry.grid(row=0, column=5, sticky=W) + countLabel.grid(row=1, column=0, sticky=W) + countSpinbox.grid(row=1, column=1, sticky=W) + balancingCheckbutton.grid(row=1, column=2, sticky=W, columnspan=2) + patchesCheckbutton.grid(row=1, column=4, sticky=W, columnspan=2) - worldLabel.pack(side=LEFT) - worldSpinbox.pack(side=LEFT) - namesLabel.pack(side=LEFT) - namesEntry.pack(side=LEFT, expand=True, fill=X) - seedLabel.pack(side=LEFT, padx=(5, 0)) - seedEntry.pack(side=LEFT) - countLabel.pack(side=LEFT, padx=(5, 0)) - countSpinbox.pack(side=LEFT) generateButton.pack(side=RIGHT, padx=(5, 0)) openOutputButton.pack(side=LEFT) diff --git a/Utils.py b/Utils.py index 12bc9278..7d17da6f 100644 --- a/Utils.py +++ b/Utils.py @@ -11,7 +11,7 @@ class Version(typing.NamedTuple): micro: int -__version__ = "3.4.2" +__version__ = "3.5.0" _version_tuple = tuplize_version(__version__) import os diff --git a/playerSettings.yaml b/playerSettings.yaml index a66bd389..22b40aa9 100644 --- a/playerSettings.yaml +++ b/playerSettings.yaml @@ -173,6 +173,9 @@ item_functionality: progression_balancing: on: 50 # A system to reduce BK, as in times during which you can't do anything by moving your items into an earlier access sphere to make it likely you have stuff to do off: 0 # Turn this off if you don't mind a longer multiworld, or can glitch around missing items. +tile_shuffle: # Randomize the tile layouts in flying tile rooms + on: 0 + off: 50 ### Enemizer Section ### boss_shuffle: none: 50 # Vanilla bosses @@ -186,9 +189,6 @@ enemy_shuffle: # Randomize enemy placement killable_thieves: # Make thieves killable on: 0 # Usually turned on together with enemy_shuffle to make annoying thief placement more manageable off: 50 -tile_shuffle: # Randomize the tile layouts in flying tile rooms - on: 0 - off: 50 bush_shuffle: # Randomize the chance that bushes have enemies and the enemies under said bush on: 0 off: 50