Finish bps work

Fixing a couple bugs

CLI.py

@@ -95,7 +95,7 @@ def parse_cli(argv, no_defaults=False):
                          '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', 'keydropshuffle']:
+                         'remote_items', 'keydropshuffle', 'mixed_travel']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
@@ -145,6 +145,7 @@ def parse_settings():
         "intensity": 2,
         "experimental": False,
         "dungeon_counters": "default",
+        "mixed_travel": "prevent",
 
         "multi": 1,
         "names": "",