Edge rom changes and minor mystery defensive coding

This commit is contained in:
aerinon
2020-05-02 15:09:23 -06:00
parent 79c4889e07
commit 0705ccaeda
3 changed files with 3 additions and 3 deletions

View File

@@ -151,7 +151,7 @@ def roll_settings(weights):
ret.door_shuffle = door_shuffle if door_shuffle != 'none' else 'vanilla' ret.door_shuffle = door_shuffle if door_shuffle != 'none' else 'vanilla'
ret.experimental = get_choice('experimental') == 'on' ret.experimental = get_choice('experimental') == 'on'
ret.dungeon_counters = get_choice('dungeon_counters') ret.dungeon_counters = get_choice('dungeon_counters') if 'dungeon_counters' in weights else 'default'
if ret.dungeon_counters == 'default': if ret.dungeon_counters == 'default':
ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off' ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off'

2
Rom.py
View File

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '6042de1d3a63417efe4397b69c626b88' RANDOMIZERBASEHASH = 'a793b94179f7a4afcfd958bac3a79b47'
class JsonRom(object): class JsonRom(object):

File diff suppressed because one or more lines are too long