alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable"

Browse Source 
This reverts commit 3448693f52, reversing
changes made to f2c021500d.
This commit is contained in:
aerinon
2021-02-25 16:16:20 -07:00
parent af441a8e9b
commit f1fd2c2759
3 changed files with 55 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
source/gui/adjust/overview.py
View File

@@ -1,7 +1,6 @@
from tkinter import ttk, filedialog, messagebox, StringVar, Button, Entry, Frame, Label, E, W, LEFT, RIGHT, X, BOTTOM from tkinter import ttk, filedialog, messagebox, StringVar, Button, Entry, Frame, Label, E, W, LEFT, RIGHT, X, BOTTOM
from AdjusterMain import adjust from AdjusterMain import adjust
from argparse import Namespace from argparse import Namespace
from source.classes.Empty import Empty
from source.classes.SpriteSelector import SpriteSelector from source.classes.SpriteSelector import SpriteSelector
import source.gui.widgets as widgets import source.gui.widgets as widgets
import json import json
@@ -45,101 +44,49 @@ def adjust_page(top, parent, settings):
# Sprite Selection # Sprite Selection
# This one's more-complicated, build it and stuff it # This one's more-complicated, build it and stuff it
# widget ID self.spriteNameVar2 = StringVar()
widget = "sprite" spriteDialogFrame2 = Frame(self.frames["leftAdjustFrame"])
baseSpriteLabel2 = Label(spriteDialogFrame2, text='Sprite:')
# Empty object spriteEntry2 = Label(spriteDialogFrame2, textvariable=self.spriteNameVar2)
self.widgets[widget] = Empty()
# pieces
self.widgets[widget].pieces = {}
# frame
self.widgets[widget].pieces["frame"] = Frame(self.frames["leftAdjustFrame"])
# frame: label
self.widgets[widget].pieces["frame"].label = Label(self.widgets[widget].pieces["frame"], text='Sprite: ')
# spritename: label
self.widgets[widget].pieces["frame"].spritename = Label(self.widgets[widget].pieces["frame"], text='(unchanged)')
# storage var
self.widgets[widget].storageVar = StringVar()
self.widgets[widget].storageVar.set(settings["sprite"])
# store sprite
self.sprite = None self.sprite = None
def set_sprite(sprite_param, random_sprite=False): def set_sprite(sprite_param, random_sprite=False):
top.randomSprite.set(random_sprite)
widget = "sprite"
sprite = {}
sprite["object"] = sprite_param
sprite["label"] = {
"show": "(unchanged)",
"store": "(unchanged)"
}
if sprite_param is None or not sprite_param.valid: if sprite_param is None or not sprite_param.valid:
self.sprite = None self.sprite = None
self.spriteNameVar2.set('(unchanged)')
else: else:
self.sprite = sprite_param self.sprite = sprite_param
sprite["label"]["store"] = sprite_param.name self.spriteNameVar2.set(self.sprite.name)
sprite["label"]["show"] = sprite_param.name if not random_sprite else "(random)" top.randomSprite.set(random_sprite)
self.widgets[widget].storageVar.set(sprite["label"]["store"])
self.widgets[widget].pieces["frame"].spritename.config(text=sprite["label"]["show"])
print(top.randomSprite.get(),sprite["label"])
def SpriteSelectAdjuster(): def SpriteSelectAdjuster():
SpriteSelector(parent, set_sprite, adjuster=True) SpriteSelector(parent, set_sprite, adjuster=True)
# dialog button spriteSelectButton2 = Button(spriteDialogFrame2, text='...', command=SpriteSelectAdjuster)
self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='...', command=SpriteSelectAdjuster)
# frame label: pack baseSpriteLabel2.pack(side=LEFT)
self.widgets[widget].pieces["frame"].label.pack(side=LEFT) spriteEntry2.pack(side=LEFT)
# spritename: pack spriteSelectButton2.pack(side=LEFT)
self.widgets[widget].pieces["frame"].spritename.pack(side=LEFT) spriteDialogFrame2.pack(anchor=E)
# button: pack
self.widgets[widget].pieces["button"].pack(side=LEFT)
# frame: pack
self.widgets[widget].pieces["frame"].pack(anchor=E)
self.frames["adjustrom"] = Frame(self.frames["bottomAdjustFrame"])
self.frames["adjustrom"].pack(anchor=W, fill=X)
# Path to game file to Adjust # Path to game file to Adjust
# This one's more-complicated, build it and stuff it # This one's more-complicated, build it and stuff it
# widget ID adjustRomFrame = Frame(self.frames["bottomAdjustFrame"])
widget = "adjustrom" adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ')
self.romVar2 = StringVar(value=settings["rom"])
romEntry2 = Entry(adjustRomFrame, textvariable=self.romVar2)
# Empty object def RomSelect2():
self.widgets[widget] = Empty() rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")])
# pieces if rom:
self.widgets[widget].pieces = {} settings["rom"] = rom
self.romVar2.set(rom)
romSelectButton2 = Button(adjustRomFrame, text='Select Rom', command=RomSelect2)
# frame adjustRomLabel.pack(side=LEFT)
self.widgets[widget].pieces["frame"] = Frame(self.frames["adjustrom"]) romEntry2.pack(side=LEFT, fill=X, expand=True)
# frame: label romSelectButton2.pack(side=LEFT)
self.widgets[widget].pieces["frame"].label = Label(self.widgets[widget].pieces["frame"], text='Rom to Adjust: ') adjustRomFrame.pack(fill=X)
# storage var
self.widgets[widget].storageVar = StringVar()
# textbox
self.widgets[widget].pieces["textbox"] = Entry(self.widgets[widget].pieces["frame"], textvariable=self.widgets[widget].storageVar)
self.widgets[widget].storageVar.set(settings["rom"])
# FIXME: Translate these
def RomSelect():
widget = "adjustrom"
rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
self.widgets[widget].storageVar.set(rom)
# dialog button
self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='Select Rom', command=RomSelect)
# frame label: pack
self.widgets[widget].pieces["frame"].label.pack(side=LEFT)
# textbox: pack
self.widgets[widget].pieces["textbox"].pack(side=LEFT, fill=X, expand=True)
# button: pack
self.widgets[widget].pieces["button"].pack(side=LEFT)
# frame: pack
self.widgets[widget].pieces["frame"].pack(fill=X)
# These are the options to Adjust # These are the options to Adjust
def adjustRom(): def adjustRom():

88
source/gui/randomize/gameoptions.py
View File

@@ -1,7 +1,6 @@
from tkinter import ttk, StringVar, Button, Entry, Frame, Label, E, W, LEFT, RIGHT from tkinter import ttk, StringVar, Button, Entry, Frame, Label, E, W, LEFT, RIGHT
from functools import partial from functools import partial
from source.classes.Empty import Empty import source.classes.SpriteSelector as spriteSelector
from source.classes.SpriteSelector import SpriteSelector
import source.gui.widgets as widgets import source.gui.widgets as widgets
import json import json
import os import os
@@ -40,79 +39,46 @@ def gameoptions_page(top, parent):
packAttrs["anchor"] = W packAttrs["anchor"] = W
self.widgets[key].pack(packAttrs) self.widgets[key].pack(packAttrs)
# Sprite Selection ## Sprite selection
# This one's more-complicated, build it and stuff it # This one's more-complicated, build it and stuff it
# widget ID spriteDialogFrame = Frame(self.frames["leftRomOptionsFrame"])
widget = "sprite" baseSpriteLabel = Label(spriteDialogFrame, text='Sprite:')
# Empty object self.widgets["sprite"] = {}
self.widgets[widget] = Empty() self.widgets["sprite"]["spriteObject"] = None
# pieces self.widgets["sprite"]["spriteNameVar"] = StringVar()
self.widgets[widget].pieces = {}
# frame self.widgets["sprite"]["spriteNameVar"].set('(unchanged)')
self.widgets[widget].pieces["frame"] = Frame(self.frames["leftRomOptionsFrame"]) spriteEntry = Label(spriteDialogFrame, textvariable=self.widgets["sprite"]["spriteNameVar"])
# frame: label
self.widgets[widget].pieces["frame"].label = Label(self.widgets[widget].pieces["frame"], text='Sprite: ')
# spritename: label
self.widgets[widget].pieces["frame"].spritename = Label(self.widgets[widget].pieces["frame"], text='(unchanged)')
# storage var
self.widgets[widget].storageVar = StringVar()
# store sprite def sprite_setter(spriteObject):
self.sprite = None self.widgets["sprite"]["spriteObject"] = spriteObject
def SpriteSetter(spriteObject): def sprite_select():
sprite = {} spriteSelector.SpriteSelector(parent, partial(set_sprite, spriteSetter=sprite_setter,
sprite["object"] = spriteObject spriteNameVar=self.widgets["sprite"]["spriteNameVar"],
sprite["label"] = { randomSpriteVar=top.randomSprite))
"show": "(unchanged)",
"store": "(unchanged)"
}
sprite["label"]["store"] = sprite["object"].name
sprite["label"]["show"] = sprite["object"].name if not top.randomSprite.get() else "(random)"
print(top.randomSprite.get(),sprite["label"]) spriteSelectButton = Button(spriteDialogFrame, text='...', command=sprite_select)
self.sprite = sprite["object"] baseSpriteLabel.pack(side=LEFT)
self.widgets[widget].pieces["frame"].spritename.config(text=sprite["label"]["show"]) spriteEntry.pack(side=LEFT)
def SpriteSelect(): spriteSelectButton.pack(side=LEFT)
SpriteSelector(parent, partial(set_sprite, spriteSetter=SpriteSetter,spriteNameVar=self.widgets[widget].storageVar,randomSpriteVar=top.randomSprite)) spriteDialogFrame.pack(anchor=E)
# dialog button
self.widgets[widget].pieces["button"] = Button(self.widgets[widget].pieces["frame"], text='...', command=SpriteSelect)
# frame label: pack
self.widgets[widget].pieces["frame"].label.pack(side=LEFT)
# spritename: pack
self.widgets[widget].pieces["frame"].spritename.pack(side=LEFT)
# button: pack
self.widgets[widget].pieces["button"].pack(side=LEFT)
# frame: pack
self.widgets[widget].pieces["frame"].pack(anchor=E)
return self return self
def set_sprite(sprite_param, random_sprite=False, spriteSetter=None, spriteNameVar=None, randomSpriteVar=None):
if randomSpriteVar:
randomSpriteVar.set(random_sprite)
widget = "sprite" def set_sprite(sprite_param, random_sprite=False, spriteSetter=None, spriteNameVar=None, randomSpriteVar=None):
sprite = {} if sprite_param is None or not sprite_param.valid:
sprite["object"] = sprite_param
sprite["label"] = {
"show": "(unchanged)",
"store": "(unchanged)"
}
if sprite["object"] is None or not sprite["object"].valid:
if spriteSetter: if spriteSetter:
spriteSetter(None) spriteSetter(None)
if spriteNameVar is not None: if spriteNameVar is not None:
spriteNameVar.set(sprite["store"]) spriteNameVar.set('(unchanged)')
else: else:
if spriteSetter: if spriteSetter:
spriteSetter(sprite["object"]) spriteSetter(sprite_param)
if spriteNameVar is not None: if spriteNameVar is not None:
spriteNameVar.set(sprite["label"]["store"]) spriteNameVar.set(sprite_param.name)
sprite["label"]["store"] = sprite["object"].name if randomSpriteVar:
sprite["label"]["show"] = sprite["object"].name if not random_sprite else "(random)" randomSpriteVar.set(random_sprite)

4
source/gui/randomize/generation.py
View File

@@ -65,7 +65,6 @@ def generation_page(parent,settings):
# FIXME: Translate these # FIXME: Translate these
def RomSelect(): def RomSelect():
widget = "rom"
rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join(".")) rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
self.widgets[widget].storageVar.set(rom) self.widgets[widget].storageVar.set(rom)
# dialog button # dialog button
@@ -95,6 +94,7 @@ def generation_page(parent,settings):
self.frames["diags"].pack() self.frames["diags"].pack()
self.widgets[widget].pieces["frame"] = Frame(self.frames["diags"]) self.widgets[widget].pieces["frame"] = Frame(self.frames["diags"])
def diags(): def diags():
# Debugging purposes # Debugging purposes
dims = { dims = {
@@ -106,7 +106,7 @@ def generation_page(parent,settings):
"width": 120, "width": 120,
"height": 50 "height": 50
} }
} }
diag = Tk() diag = Tk()
diag.title("Door Shuffle " + __version__) diag.title("Door Shuffle " + __version__)
diag.geometry(str(dims["window"]["width"]) + 'x' + str(dims["window"]["height"])) diag.geometry(str(dims["window"]["width"]) + 'x' + str(dims["window"]["height"]))