morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo

Browse Source
This commit is contained in:
Fabian Dill
2020-10-07 23:19:16 +02:00
parent 48becac8ff
commit 88a5e024c7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gui.py
View File

@@ -369,7 +369,7 @@ def guiMain(args=None):
prizeVar.set('general') prizeVar.set('general')
prizeOptionMenu = OptionMenu(prizeFrame, prizeVar, 'none', 'general', 'bonk', 'both') prizeOptionMenu = OptionMenu(prizeFrame, prizeVar, 'none', 'general', 'bonk', 'both')
prizeOptionMenu.pack(side=RIGHT) prizeOptionMenu.pack(side=RIGHT)
prizeLabel = Label(prizeFrame, text='Shuffle Prices/Drops') prizeLabel = Label(prizeFrame, text='Shuffle Prizes/Drops')
prizeLabel.pack(side=LEFT) prizeLabel.pack(side=LEFT)

8
Mystery.py
View File

@@ -279,7 +279,7 @@ def roll_settings(weights):
glitches_required] glitches_required]
ret.dark_room_logic = get_choice("dark_room_logic", weights, "lamp") ret.dark_room_logic = get_choice("dark_room_logic", weights, "lamp")
if not ret.dark_room_logic: # None/False if not ret.dark_room_logic: # None/False
ret.dark_room_logic = "none" ret.dark_room_logic = "none"
if ret.dark_room_logic == "sconces": if ret.dark_room_logic == "sconces":
ret.dark_room_logic = "torches" ret.dark_room_logic = "torches"
@@ -340,14 +340,14 @@ def roll_settings(weights):
# sum a percentage to required # sum a percentage to required
if extra_pieces == 'percentage': if extra_pieces == 'percentage':
percentage = max(100,get_choice('triforce_pieces_percentage',weights,150))/100 percentage = max(100, get_choice('triforce_pieces_percentage', weights, 150)) / 100
ret.triforce_pieces_available = int(ret.triforce_pieces_required * percentage) ret.triforce_pieces_available = int(ret.triforce_pieces_required * percentage)
# vanilla mode (specify how many pieces are) # vanilla mode (specify how many pieces are)
elif extra_pieces == 'available': elif extra_pieces == 'available':
ret.triforce_pieces_available = get_choice('triforce_pieces_available',weights,30) ret.triforce_pieces_available = get_choice('triforce_pieces_available', weights, 30)
# required pieces + fixed extra # required pieces + fixed extra
elif extra_pieces == 'extra': elif extra_pieces == 'extra':
extra_pieces = max(0, get_choice('triforce_pieces_extra',weights,10)) extra_pieces = max(0, get_choice('triforce_pieces_extra', weights, 10))
ret.triforce_pieces_available = ret.triforce_pieces_required + extra_pieces ret.triforce_pieces_available = ret.triforce_pieces_required + extra_pieces
# change minimum to required pieces to avoid problems # change minimum to required pieces to avoid problems