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

Implement save system

Browse Source 
Add to .gitignore
Add to default CLI args
Add to each page that needs it
* Rom Adjuster
* Seed
* Generation attempts
* Enemizer CLI path
* Base ROM
* Multiworld worlds
* Multiworld names
This commit is contained in:
Mike A. Trethewey
2020-02-08 19:01:15 -08:00
parent 2c91550e50
commit 03431f0b83
8 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/adjust/overview.py
View File

@@ -4,7 +4,7 @@ from argparse import Namespace
from classes.SpriteSelector import SpriteSelector
import logging
def adjust_page(top,parent):#,working_dirs):
def adjust_page(top,parent,working_dirs):
self = ttk.Frame(parent)
# Disable BGM
@@ -101,14 +101,13 @@ def adjust_page(top,parent):#,working_dirs):
adjustRomFrame = Frame(bottomAdjustFrame)
adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ')
self.romVar2 = StringVar()
# romVar2 = StringVar(value=working_dirs["adjust.rom"])
self.romVar2 = StringVar(value=working_dirs["adjust.rom"])
romEntry2 = Entry(adjustRomFrame, textvariable=self.romVar2)
def RomSelect2():
rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")])
if rom:
# working_dirs["adjust.rom"] = rom
working_dirs["adjust.rom"] = rom
self.romVar2.set(rom)
romSelectButton2 = Button(adjustRomFrame, text='Select Rom', command=RomSelect2)
@@ -140,4 +139,4 @@ def adjust_page(top,parent):#,working_dirs):
adjustButton = Button(bottomAdjustFrame, text='Adjust Rom', command=adjustRom)
adjustButton.pack(side=BOTTOM, padx=(5, 0))
return self#,working_dirs
return self,working_dirs

16
gui/bottom.py
View File

@@ -8,26 +8,23 @@ from Main import main
from Utils import local_path, output_path, open_file
def bottom_frame(self,parent,args=None):
# working_dirs = get_working_dirs()
self = ttk.Frame(parent)
seedCountFrame = Frame(self)
seedCountFrame.pack()
## Seed #
seedLabel = Label(self, text='Seed #')
# self.seedVar = StringVar(value=parent.working_dirs["gen.seed"])
self.seedVar = StringVar()
savedSeed = parent.working_dirs["gen.seed"]
self.seedVar = StringVar(value=savedSeed)
def saveSeed(caller,_,mode):
pass
# parent.working_dirs["gen.seed"] = self.seedVar.get()
savedSeed = self.seedVar.get()
parent.working_dirs["gen.seed"] = int(savedSeed) if savedSeed.isdigit() else None
self.seedVar.trace_add("write",saveSeed)
seedEntry = Entry(self, width=15, textvariable=self.seedVar)
seedLabel.pack(side=LEFT)
seedEntry.pack(side=LEFT)
## Number of Generation attempts
countLabel = Label(self, text='Count')
# self.countVar = StringVar(value=working_dirs["gen.count"])
self.countVar = StringVar()
self.countVar = StringVar(value=parent.working_dirs["gen.count"])
countSpinbox = Spinbox(self, from_=1, to=100, width=5, textvariable=self.countVar)
countLabel.pack(side=LEFT)
countSpinbox.pack(side=LEFT)
@@ -118,8 +115,7 @@ def bottom_frame(self,parent,args=None):
if args and args.outputpath:
open_file(output_path(args.outputpath))
else:
open_file(output_path("."))
# open_file(output_path(working_dirs["outputpath"]))
open_file(output_path(parent.working_dirs["outputpath"]))
openOutputButton = Button(self, text='Open Output Directory', command=open_output)
openOutputButton.pack(side=RIGHT)

11
gui/randomize/enemizer.py
View File

@@ -1,7 +1,7 @@
import os
from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, E, W, LEFT, RIGHT, X
def enemizer_page(parent):#,working_dirs):
def enemizer_page(parent,working_dirs):
self = ttk.Frame(parent)
# Enemizer
@@ -16,10 +16,9 @@ def enemizer_page(parent):#,working_dirs):
enemizerPathFrame.grid(row=0, column=0, columnspan=3, sticky=W+E)
enemizerCLIlabel = Label(enemizerPathFrame, text="EnemizerCLI path: ")
enemizerCLIlabel.pack(side=LEFT)
self.enemizerCLIpathVar = StringVar()
self.enemizerCLIpathVar = StringVar(value=working_dirs["enemizer.cli"])
def saveEnemizerPath(caller,_,mode):
pass
#working_dirs["enemizer.cli"] = self.enemizerCLIpathVar.get()
working_dirs["enemizer.cli"] = self.enemizerCLIpathVar.get()
self.enemizerCLIpathVar.trace_add("write",saveEnemizerPath)
enemizerCLIpathEntry = Entry(enemizerPathFrame, textvariable=self.enemizerCLIpathVar)
enemizerCLIpathEntry.pack(side=LEFT, fill=X, expand=True)
@@ -27,7 +26,7 @@ def enemizer_page(parent):#,working_dirs):
path = filedialog.askopenfilename(filetypes=[("EnemizerCLI executable", "*EnemizerCLI*")], initialdir=os.path.join("."))
if path:
self.enemizerCLIpathVar.set(path)
#working_dirs["enemizer.cli"] = path
working_dirs["enemizer.cli"] = path
enemizerCLIbrowseButton = Button(enemizerPathFrame, text='...', command=EnemizerSelectPath)
enemizerCLIbrowseButton.pack(side=LEFT)
@@ -76,4 +75,4 @@ def enemizer_page(parent):#,working_dirs):
enemizerHealthOption = OptionMenu(enemizerHealthFrame, self.enemizerHealthVar, 'default', 'easy', 'normal', 'hard', 'expert')
enemizerHealthOption.pack(side=LEFT)
return self#,working_dirs
return self,working_dirs

9
gui/randomize/generation.py
View File

@@ -1,7 +1,7 @@
import os
from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, E, W, LEFT, RIGHT, X
def generation_page(parent):#,working_dirs):
def generation_page(parent,working_dirs):
self = ttk.Frame(parent)
# Generation Setup options
@@ -22,11 +22,10 @@ def generation_page(parent):#,working_dirs):
baseRomLabel = Label(baseRomFrame, text='Base Rom: ')
self.romVar = StringVar()
def saveBaseRom(caller,_,mode):
pass
# working_dirs["rom.base"] = self.romVar.get()
working_dirs["rom.base"] = self.romVar.get()
self.romVar.trace_add("write",saveBaseRom)
romEntry = Entry(baseRomFrame, textvariable=self.romVar)
# self.romVar.set(working_dirs["rom.base"])
self.romVar.set(working_dirs["rom.base"])
def RomSelect():
rom = filedialog.askopenfilename(filetypes=[("Rom Files", (".sfc", ".smc")), ("All Files", "*")], initialdir=os.path.join("."))
@@ -38,4 +37,4 @@ def generation_page(parent):#,working_dirs):
romSelectButton.pack(side=LEFT)
baseRomFrame.pack(fill=X, expand=True)
return self#,working_dirs
return self,working_dirs

13
gui/randomize/multiworld.py
View File

@@ -1,28 +1,25 @@
from tkinter import ttk, StringVar, Entry, Frame, Label, Spinbox, E, W, LEFT, RIGHT
def multiworld_page(parent):#,working_dirs):
def multiworld_page(parent,working_dirs):
self = ttk.Frame(parent)
# Multiworld
multiFrame = Frame(self)
## Number of Worlds
worldLabel = Label(multiFrame, text='Worlds')
# self.worldVar = StringVar(value=working_dirs["multi.worlds"])
self.worldVar = StringVar(value="1")
self.worldVar = StringVar(value=working_dirs["multi.worlds"])
worldSpinbox = Spinbox(multiFrame, from_=1, to=100, width=5, textvariable=self.worldVar)
worldLabel.pack(side=LEFT)
worldSpinbox.pack(side=LEFT)
## List of Player Names
namesLabel = Label(multiFrame, text='Player names')
self.namesVar = StringVar()
# self.namesVar = StringVar(value=working_dirs["multi.names"])
self.namesVar = StringVar(value=working_dirs["multi.names"])
def saveMultiNames(caller,_,mode):
pass
#working_dirs["multi.names"] = self.namesVar.get()
working_dirs["multi.names"] = self.namesVar.get()
self.namesVar.trace_add("write",saveMultiNames)
namesEntry = Entry(multiFrame, textvariable=self.namesVar)
namesLabel.pack(side=LEFT)
namesEntry.pack(side=LEFT)
multiFrame.pack(anchor=W)
return self#,working_dirs
return self,working_dirs