making sure godhome is in logic for any and removing redundancy on completion condition

Author: qwint

worlds/hk/__init__.py

@@ -203,7 +203,7 @@ def create_regions(self):
 
         # check for any goal that godhome events are relevant to
         all_event_names = event_names.copy()
-        if self.multiworld.Goal[self.player] in [Goal.option_godhome, Goal.option_godhome_flower]:
+        if self.multiworld.Goal[self.player] in [Goal.option_godhome, Goal.option_godhome_flower, Goal.option_any]:
             from .GodhomeData import godhome_event_names
             all_event_names.update(set(godhome_event_names))
 
@@ -447,7 +447,7 @@ def set_rules(self):
             pass  # will set in pre_fill()
         else:
             # Any goal
-            world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player) or state._hk_can_beat_radiance(player) or state.count("Defeated_Pantheon_5", player) or state.count("Godhome_Flower_Quest", player)
+            world.completion_condition[player] = lambda state: state._hk_can_beat_thk(player) or state._hk_can_beat_radiance(player) or state.count("Defeated_Pantheon_5", player)
 
         set_rules(self)