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

Fix Custom Item Pool (again again)

Browse Source
This commit is contained in:
Mike A. Trethewey
2020-02-23 16:21:39 -08:00
parent 55fee9317d
commit baec0e4548
5 changed files with 204 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/bottom.py
View File

@@ -6,6 +6,7 @@ import random
from CLI import parse_arguments, get_settings
from Main import main
from Utils import local_path, output_path, open_file
import classes.constants as CONST
import gui.widgets as widgets
@@ -178,21 +179,10 @@ def create_guiargs(parent):
internal = adjustargs[adjustarg]
setattr(guiargs,"adjust." + internal, parent.pages["adjust"].content.widgets[adjustarg].storageVar.get())
customitems = [
"bow", "progressivebow", "boomerang", "redmerang", "hookshot", "mushroom", "powder", "firerod",
"icerod", "bombos", "ether", "quake", "lamp", "hammer", "shovel",
"flute", "bugnet", "book", "bottle", "somaria", "byrna", "cape", "mirror",
"boots", "powerglove", "titansmitt", "progressiveglove", "flippers", "pearl", "heartpiece",
"heartcontainer", "sancheart", "sword1", "sword2", "sword3", "sword4", "progressivesword",
"shield1", "shield2", "shield3", "progressiveshield", "mail2",
"mail3", "progressivemail", "halfmagic", "quartermagic", "bombsplus5", "bombsplus10", "arrowsplus5", "arrowsplus10",
"arrow1", "arrow10", "bomb1", "bomb3", "bomb10", "rupee1", "rupee5", "rupee20",
"rupee50", "rupee100", "rupee300", "blueclock", "greenclock", "redclock", "silversupgrade", "generickeys",
"triforcepieces", "triforcepiecesgoal", "triforce", "rupoor", "rupoorcost"
]
guiargs.customitemarray = []
customitems = CONST.CUSTOMITEMS
guiargs.customitemarray = {}
for customitem in customitems:
guiargs.customitemarray.append(int(parent.pages["custom"].content.customWidgets[customitem].storageVar.get()))
guiargs.customitemarray[customitem] = int(parent.pages["custom"].content.customWidgets[customitem].storageVar.get())
guiargs.sprite = parent.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"]
guiargs.randomSprite = parent.randomSprite.get()

7
gui/custom/overview.py
View File

@@ -3,6 +3,8 @@ import gui.widgets as widgets
import json
import os
import classes.constants as CONST
def custom_page(top,parent):
# Custom Item Pool
self = ttk.Frame(parent)
@@ -46,8 +48,7 @@ def custom_page(top,parent):
for key in dictWidgets:
self.customWidgets[key] = dictWidgets[key]
keys = list(self.customWidgets.keys())
for i in range(0, len(keys)):
self.customWidgets[keys[i]].storageVar.set(top.settings["customitemarray"][i])
for key in CONST.CUSTOMITEMS:
self.customWidgets[key].storageVar.set(top.settings["customitemarray"][key])
return self