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

Changing colorizing pots defaults

Browse Source
This commit is contained in:
aerinon
2023-02-24 16:20:29 -07:00
parent d23d2d8323
commit 7397d779ad
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -142,7 +142,7 @@ class World(object):
set_player_attr('pot_contents', None) set_player_attr('pot_contents', None)
set_player_attr('pseudoboots', False) set_player_attr('pseudoboots', False)
set_player_attr('collection_rate', False) set_player_attr('collection_rate', False)
set_player_attr('colorizepots', False) set_player_attr('colorizepots', True)
set_player_attr('pot_pool', {}) set_player_attr('pot_pool', {})
set_player_attr('decoupledoors', False) set_player_attr('decoupledoors', False)
set_player_attr('door_type_mode', 'original') set_player_attr('door_type_mode', 'original')

2
CLI.py
View File

@@ -205,7 +205,7 @@ def parse_settings():
'keydropshuffle': False, 'keydropshuffle': False,
'dropshuffle': False, 'dropshuffle': False,
'pottery': 'none', 'pottery': 'none',
'colorizepots': False, 'colorizepots': True,
'shufflepots': False, 'shufflepots': False,
'mapshuffle': False, 'mapshuffle': False,
'compassshuffle': False, 'compassshuffle': False,

5
Rom.py
View File

@@ -1585,9 +1585,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
Room0127.write_to_rom(snes_to_pc(0x2B8000), rom) Room0127.write_to_rom(snes_to_pc(0x2B8000), rom)
if world.pot_contents[player]: if world.pot_contents[player]:
colorize_pots = is_mystery or (world.pottery[player] not in ['vanilla', 'lottery'] colorize_pots = (world.pottery[player] != 'vanilla'
and (world.colorizepots[player] and (world.colorizepots[player] or world.pottery[player] in ['reduced', 'clustered']))
or world.pottery[player] in ['reduced', 'clustered']))
if world.pot_contents[player].size() > 0x2800: if world.pot_contents[player].size() > 0x2800:
raise Exception('Pot table is too big for current area') raise Exception('Pot table is too big for current area')
world.pot_contents[player].write_pot_data_to_rom(rom, colorize_pots) world.pot_contents[player].write_pot_data_to_rom(rom, colorize_pots)

2
source/tools/MysteryUtils.py
View File

@@ -102,7 +102,7 @@ def roll_settings(weights):
ret.dropshuffle = get_choice('dropshuffle') == 'on' or keydropshuffle ret.dropshuffle = get_choice('dropshuffle') == 'on' or keydropshuffle
ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none' ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none'
ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery
ret.colorizepots = get_choice('colorizepots') == 'on' ret.colorizepots = get_choice_default('colorizepots', default='on') == 'on'
ret.shufflepots = get_choice('pot_shuffle') == 'on' ret.shufflepots = get_choice('pot_shuffle') == 'on'
ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent' ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'
ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights