From 7397d779ad8c87cb184b9c2cdc6af932705422b1 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Fri, 24 Feb 2023 16:20:29 -0700
Subject: [PATCH] Changing colorizing pots defaults

---
 BaseClasses.py               | 2 +-
 CLI.py                       | 2 +-
 Rom.py                       | 5 ++---
 source/tools/MysteryUtils.py | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index dd39cfc9..0dc89695 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -142,7 +142,7 @@ class World(object):
             set_player_attr('pot_contents', None)
             set_player_attr('pseudoboots', 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('decoupledoors', False)
             set_player_attr('door_type_mode', 'original')
diff --git a/CLI.py b/CLI.py
index 536543f2..d1bc47d3 100644
--- a/CLI.py
+++ b/CLI.py
@@ -205,7 +205,7 @@ def parse_settings():
         'keydropshuffle': False,
         'dropshuffle': False,
         'pottery': 'none',
-        'colorizepots': False,
+        'colorizepots': True,
         'shufflepots': False,
         'mapshuffle': False,
         'compassshuffle': False,
diff --git a/Rom.py b/Rom.py
index 1dd05a8f..6be923da 100644
--- a/Rom.py
+++ b/Rom.py
@@ -1585,9 +1585,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
         Room0127.write_to_rom(snes_to_pc(0x2B8000), rom)
 
     if world.pot_contents[player]:
-        colorize_pots = is_mystery or (world.pottery[player] not in ['vanilla', 'lottery']
-                                       and (world.colorizepots[player]
-                                            or world.pottery[player] in ['reduced', 'clustered']))
+        colorize_pots = (world.pottery[player] != 'vanilla'
+                         and (world.colorizepots[player] or world.pottery[player] in ['reduced', 'clustered']))
         if world.pot_contents[player].size() > 0x2800:
             raise Exception('Pot table is too big for current area')
         world.pot_contents[player].write_pot_data_to_rom(rom, colorize_pots)
diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py
index 322ed447..2bdcdcd7 100644
--- a/source/tools/MysteryUtils.py
+++ b/source/tools/MysteryUtils.py
@@ -102,7 +102,7 @@ def roll_settings(weights):
     ret.dropshuffle = get_choice('dropshuffle') == 'on' or keydropshuffle
     ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none'
     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.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