Re-worked settings for pottery lottery

Fixed multiworld support for lottery

CLI.py

@@ -88,6 +88,10 @@ def parse_cli(argv, no_defaults=False):
     if ret.keysanity:
         ret.mapshuffle, ret.compassshuffle, ret.keyshuffle, ret.bigkeyshuffle = [True] * 4
 
+    if ret.keydropshuffle:
+        ret.dropshuffle = True
+        ret.pottery = 'keys' if ret.pottery == 'none' else ret.pottery
+
     if multiargs.multi:
         defaults = copy.deepcopy(ret)
         for player in range(1, multiargs.multi + 1):
@@ -101,9 +105,9 @@ def parse_cli(argv, no_defaults=False):
                          'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
                          'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
                          'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
-                         'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep',
-                         'remote_items', 'shopsanity', 'keydropshuffle', 'mixed_travel', 'standardize_palettes', 'code',
-                         'reduce_flashing', 'shuffle_sfx']:
+                         'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor',
+                         'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery',
+                         'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
@@ -150,7 +154,6 @@ def parse_settings():
         "overworld_map": "default",
         "pseudoboots": False,
 
-        "shufflepots": False,
         "shuffleenemies": "none",
         "shufflebosses": "none",
         "enemy_damage": "default",
@@ -158,7 +161,10 @@ def parse_settings():
         "enemizercli": os.path.join(".", "EnemizerCLI", "EnemizerCLI.Core"),
 
         "shopsanity": False,
-        "keydropshuffle": 'none',
+        'keydropshuffle': False,
+        'dropshuffle': False,
+        'pottery': 'none',
+        'shufflepots': False,
         "mapshuffle": False,
         "compassshuffle": False,
         "keyshuffle": False,