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

Arrayify Adjust

Browse Source
This commit is contained in:
Mike A. Trethewey
2020-02-15 02:02:04 -08:00
parent 62f6642edb
commit afa96412d1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gui.py
View File

@@ -118,8 +118,8 @@ def guiMain(args=None):
self.randomSprite = BooleanVar() self.randomSprite = BooleanVar()
# Adjuster Controls # Adjuster Controls
self.adjustContent,self.settings = adjust_page(self, self.pages["adjust"], self.settings) self.pages["adjust"].content,self.settings = adjust_page(self, self.pages["adjust"], self.settings)
self.adjustContent.pack(side=TOP, fill=BOTH, expand=True) self.pages["adjust"].content.pack(side=TOP, fill=BOTH, expand=True)
# Custom Controls # Custom Controls
self.customContent = custom_page(self,self.pages["custom"]) self.customContent = custom_page(self,self.pages["custom"])

18
gui/loadcliargs.py
View File

@@ -65,19 +65,19 @@ def loadcliargs(gui, args):
spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteNameVar"], spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteNameVar"],
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)
gui.adjustContent.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic)) gui.pages["adjust"].content.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic))
gui.adjustContent.adjustWidgets['quickswap'].storageVar.set(args.quickswap) gui.pages["adjust"].content.adjustWidgets['quickswap'].storageVar.set(args.quickswap)
gui.adjustContent.adjustWidgets["heartcolor"].storageVar.set(args.heartcolor) gui.pages["adjust"].content.adjustWidgets["heartcolor"].storageVar.set(args.heartcolor)
gui.adjustContent.adjustWidgets["heartbeep"].storageVar.set(args.heartbeep) gui.pages["adjust"].content.adjustWidgets["heartbeep"].storageVar.set(args.heartbeep)
gui.adjustContent.adjustWidgets["menuspeed"].storageVar.set(args.fastmenu) gui.pages["adjust"].content.adjustWidgets["menuspeed"].storageVar.set(args.fastmenu)
gui.adjustContent.adjustWidgets["owpalettes"].storageVar.set(args.ow_palettes) gui.pages["adjust"].content.adjustWidgets["owpalettes"].storageVar.set(args.ow_palettes)
gui.adjustContent.adjustWidgets["uwpalettes"].storageVar.set(args.uw_palettes) gui.pages["adjust"].content.adjustWidgets["uwpalettes"].storageVar.set(args.uw_palettes)
def sprite_setter_adj(spriteObject): def sprite_setter_adj(spriteObject):
gui.adjustContent.sprite = spriteObject gui.pages["adjust"].content.sprite = spriteObject
if args.sprite is not None: if args.sprite is not None:
sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite) sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite)
r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False
set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj, set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj,
spriteNameVar=gui.adjustContent.spriteNameVar2, spriteNameVar=gui.pages["adjust"].content.spriteNameVar2,
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)