fix bugs

BaseClasses.py

@@ -1398,6 +1398,7 @@ def write_option(option_key: str, option_obj: type(Options.Option)):
                 if player in self.multiworld.get_game_players("A Link to the Past"):
                     outfile.write('%s%s\n' % ('Hash: ', self.hashes[player]))
 
+                    outfile.write('Goal:                            %s\n' % self.multiworld.goal[player].value)
                     outfile.write('Entrance Shuffle:                %s\n' % self.multiworld.shuffle[player])
                     if self.multiworld.shuffle[player] != "vanilla":
                         outfile.write('Entrance Shuffle Seed            %s\n' % self.multiworld.worlds[player].er_seed)

Generate.py

@@ -331,14 +331,14 @@ def handle_name(name: str, player: int, name_counter: Counter):
 
 from worlds.alttp.Options import Goal
 goals = {
-    'ganon': Goal.option_ganon_and_tower,
-    'crystals': Goal.option_ganon,
-    'bosses': Goal.option_all_bosses,
-    'pedestal': Goal.option_pedestal,
-    'ganon_pedestal': Goal.option_pedestal_ganon,
-    'triforce_hunt': Goal.option_triforce_hunt,
-    'ganon_triforce_hunt': Goal.option_triforce_hunt_ganon,
-    'ice_rod_hunt': Goal.option_ice_rod_hunt,
+    'ganon': Goal.from_any(Goal.option_ganon_and_tower),
+    'crystals': Goal.from_any(Goal.option_ganon),
+    'bosses': Goal.from_any(Goal.option_all_bosses),
+    'pedestal': Goal.from_any(Goal.option_pedestal),
+    'ganon_pedestal': Goal.from_any(Goal.option_pedestal_ganon),
+    'triforce_hunt': Goal.from_any(Goal.option_triforce_hunt),
+    'ganon_triforce_hunt': Goal.from_any(Goal.option_triforce_hunt_ganon),
+    'ice_rod_hunt': Goal.from_any(Goal.option_ice_rod_hunt),
 }
 
 

Main.py

@@ -42,6 +42,7 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
     world.shuffle = args.shuffle.copy()
     world.boss_shuffle = args.shufflebosses.copy()
+    world.goal = args.goal.copy()
     world.beemizer_total_chance = args.beemizer_total_chance.copy()
     world.beemizer_trap_chance = args.beemizer_trap_chance.copy()
     world.shop_shuffle = args.shop_shuffle.copy()

Options.py

@@ -464,6 +464,12 @@ def __eq__(self, other: typing.Any):
         else:
             raise TypeError(f"Can't compare {self.__class__.__name__} with {other.__class__.__name__}")
 
+    @classmethod
+    def get_option_name(cls, value: T) -> str:
+        if value in cls.name_lookup:
+            return cls.name_lookup[value]
+        return value
+
 
 class BossMeta(AssembleOptions):
     def __new__(mcs, name, bases, attrs):