Moved Crossed OW Shuffle to its own setting, Renamed Tile Swap to Mixed

This commit is contained in:
codemann8
2021-08-16 22:46:26 -05:00
parent 7b81c5d9da
commit be6203e3f0
20 changed files with 645 additions and 345 deletions

View File

@@ -1,4 +1,4 @@
from tkinter import ttk, Frame, Label, W, E, NW, LEFT, RIGHT, X, TOP
from tkinter import ttk, Frame, Label, W, E, NW, LEFT, RIGHT, X, Y, TOP
import source.gui.widgets as widgets
import json
import os
@@ -16,12 +16,10 @@ def overworld_page(parent):
# Load Overworld Shuffle option widgets as defined by JSON file
# Defns include frame name, widget type, widget options, widget placement attributes
# These get split left & right
self.frames["widgets"] = Frame(self)
self.frames["leftOverworldFrame"] = Frame(self.frames["widgets"])
self.frames["rightOverworldFrame"] = Frame(self.frames["widgets"])
self.frames["widgets"].pack(fill=X)
self.frames["leftOverworldFrame"].pack(side=LEFT)
self.frames["rightOverworldFrame"].pack(side=LEFT, anchor=NW)
self.frames["leftOverworldFrame"] = Frame(self)
self.frames["rightOverworldFrame"] = Frame(self)
self.frames["leftOverworldFrame"].pack(side=LEFT, anchor=NW)
self.frames["rightOverworldFrame"].pack(anchor=NW)
with open(os.path.join("resources","app","gui","randomize","overworld","widgets.json")) as overworldWidgets:
myDict = json.load(overworldWidgets)
@@ -29,8 +27,8 @@ def overworld_page(parent):
dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename])
for key in dictWidgets:
self.widgets[key] = dictWidgets[key]
if key == "rightOverworldFrame":
self.widgets[key].pack(anchor=E)
if framename == "rightOverworldFrame":
self.widgets[key].pack(side=LEFT)
else:
self.widgets[key].pack(anchor=E)