Fix some settings being mandatory in weight files

Mystery.py

@@ -128,6 +128,7 @@ def roll_settings(weights):
     ret = argparse.Namespace()
 
     glitches_required = get_choice('glitches_required')
+    if glitches_required is not None:
         if glitches_required not in ['none', 'no_logic']:
             print("Only NMG and No Logic supported")
             glitches_required = 'none'
@@ -163,6 +164,7 @@ def roll_settings(weights):
     ret.standardize_palettes = get_choice('standardize_palettes') if 'standardize_palettes' in weights else 'standardize'
 
     goal = get_choice('goals')
+    if goal is not None:
         ret.goal = {'ganon': 'ganon',
                     'fast_ganon': 'crystals',
                     'dungeons': 'dungeons',
@@ -175,7 +177,6 @@ def roll_settings(weights):
 
     ret.crystals_ganon = get_choice('ganon_open')
 
-    if ret.goal == 'triforcehunt':
     goal_min = get_choice_default('triforce_goal_min', default=20)
     goal_max = get_choice_default('triforce_goal_max', default=20)
     pool_min = get_choice_default('triforce_pool_min', default=30)
@@ -183,6 +184,7 @@ def roll_settings(weights):
     ret.triforce_goal = random.randint(int(goal_min), int(goal_max))
     min_diff = get_choice_default('triforce_min_difference', default=10)
     ret.triforce_pool = random.randint(max(int(pool_min), ret.triforce_goal + int(min_diff)), int(pool_max))
+
     ret.mode = get_choice('world_state')
     if ret.mode == 'retro':
         ret.mode = 'open'
@@ -193,11 +195,13 @@ def roll_settings(weights):
 
     ret.hints = get_choice('hints') == 'on'
 
+    swords = get_choice('weapons')
+    if swords is not None:
         ret.swords = {'randomized': 'random',
                     'assured': 'assured',
                     'vanilla': 'vanilla',
                     'swordless': 'swordless'
-                  }[get_choice('weapons')]
+                    }[swords]
 
     ret.difficulty = get_choice('item_pool')