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

Bring closer to v18

Browse Source
This commit is contained in:
Mike A. Trethewey
2020-03-03 06:56:46 -08:00
parent 61fbb00217
commit e9af70463a
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/classes/constants.py
View File

@@ -33,7 +33,7 @@ CUSTOMITEMLABELS = [
"Ocarina", "Bug Catching Net", "Book of Mudora", "Bottle", "Cane of Somaria", "Ocarina", "Bug Catching Net", "Book of Mudora", "Bottle", "Cane of Somaria",
"Cane of Byrna", "Magic Cape", "Magic Mirror", "Pegasus Boots", "Power Glove", "Cane of Byrna", "Magic Cape", "Magic Mirror", "Pegasus Boots", "Power Glove",
"Titans Mitts", "Progressive Glove", "Flippers", "Moon Pearl", "Piece of Heart", "Titans Mitts", "Progressive Glove", "Flippers", "Moon Pearl", "Piece of Heart",
"Boss Heart Container", "Sanctuary Heart Container", "Fighter Sword", "Master Sword", "Tempered Sword", "Boss Heart Container", "Sanctuary Heart Container", "Fighter Sword", "Master Sword", "Tempered Sword",
"Golden Sword", "Progressive Sword", "Blue Shield", "Red Shield", "Mirror Shield", "Golden Sword", "Progressive Sword", "Blue Shield", "Red Shield", "Mirror Shield",
"Progressive Shield", "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)", "Progressive Shield", "Blue Mail", "Red Mail", "Progressive Armor", "Magic Upgrade (1/2)",
@@ -102,7 +102,8 @@ SETTINGSTOPROCESS = {
"spoiler": "create_spoiler", "spoiler": "create_spoiler",
"suppressrom": "suppress_rom", "suppressrom": "suppress_rom",
"usestartinventory": "usestartinventory", "usestartinventory": "usestartinventory",
"usecustompool": "custom" "usecustompool": "custom",
} "saveonexit": "saveonexit"
}
} }
} }

12
source/gui/loadcliargs.py
View File

@@ -1,6 +1,6 @@
from source.classes.SpriteSelector import SpriteSelector as spriteSelector from source.classes.SpriteSelector import SpriteSelector as spriteSelector
from source.gui.randomize.gameoptions import set_sprite from source.gui.randomize.gameoptions import set_sprite
from Rom import Sprite from Rom import Sprite, get_sprite_from_name
import source.classes.constants as CONST import source.classes.constants as CONST
def loadcliargs(gui, args, settings=None): def loadcliargs(gui, args, settings=None):
@@ -39,18 +39,16 @@ def loadcliargs(gui, args, settings=None):
def sprite_setter(spriteObject): def sprite_setter(spriteObject):
gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = spriteObject gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteObject"] = 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 get_sprite_from_name(args["sprite"])
r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False set_sprite(sprite_obj, False, spriteSetter=sprite_setter,
set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter,
spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"], spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].widgets["sprite"]["spriteNameVar"],
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)
def sprite_setter_adj(spriteObject): def sprite_setter_adj(spriteObject):
gui.pages["adjust"].content.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 get_sprite_from_name(args["sprite"])
r_sprite_flag = args["randomSprite"] if hasattr(args, 'randomSprite') else False set_sprite(sprite_obj, False, spriteSetter=sprite_setter_adj,
set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj,
spriteNameVar=gui.pages["adjust"].content.spriteNameVar2, spriteNameVar=gui.pages["adjust"].content.spriteNameVar2,
randomSpriteVar=gui.randomSprite) randomSpriteVar=gui.randomSprite)