Skip to content

Commit

Permalink
Update entity_hunt.py
Browse files Browse the repository at this point in the history
  • Loading branch information
NewSoupVi authored Aug 27, 2024
1 parent 96951a2 commit b526405
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions worlds/witness/entity_hunt.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,12 @@ def _entity_is_eligible(self, panel_hex: str, plando: bool = False) -> bool:
warning(f"Panel {panel_obj['checkName']} is disabled / excluded and thus not eligible for panel hunt.")
return False

if plando:
# For a plandoed panel, everything is eligible apart from disabled panels
return True

return (
panel_hex not in self.player_logic.EXCLUDED_ENTITIES
and not (
# Due to an edge case, Discards have to be on in disable_non_randomized even if Discard Shuffle is off.
# However, I don't think they should be hunt panels in this case.
self.player_options.disable_non_randomized_puzzles
and not self.player_options.shuffle_discarded_panels
and panel_obj["locationType"] == "Discard"
)
return plando or not (
# Due to an edge case, Discards have to be on in disable_non_randomized even if Discard Shuffle is off.
# However, I don't think they should be hunt panels in this case.
self.player_options.disable_non_randomized_puzzles
and not self.player_options.shuffle_discarded_panels
and panel_obj["locationType"] == "Discard"
)

def _add_plandoed_hunt_panels_to_pre_picked(self) -> None:
Expand Down

0 comments on commit b526405

Please sign in to comment.