The Witness: Advanced Hints Options

worlds/witness/__init__.py

@@ -5,7 +5,7 @@
 from logging import error, warning
 from typing import Any, Dict, List, Optional, cast
 
-from BaseClasses import CollectionState, Entrance, Location, Region, Tutorial
+from BaseClasses import CollectionState, Entrance, Location, LocationProgressType, Region, Tutorial
 
 from Options import OptionError, PerGameCommonOptions, Toggle
 from worlds.AutoWorld import WebWorld, World
@@ -239,10 +239,8 @@ def create_regions(self) -> None:
         # Then, add checks in order until the required amount of sphere 1 checks is met.
 
         extra_checks = [
-            ("Tutorial First Hallway Room", "Tutorial First Hallway Bend"),
-            ("Tutorial First Hallway", "Tutorial First Hallway Straight"),
-            ("Desert Outside", "Desert Surface 1"),
-            ("Desert Outside", "Desert Surface 2"),
+            (location, static_witness_logic.ENTITIES_BY_NAME[location]["region"]["name"])
+            for location in static_witness_locations.EXTRA_LOCATIONS
         ]
 
         for i in range(num_early_locs, needed_size):
@@ -328,6 +326,13 @@ def fill_slot_data(self) -> Dict[str, Any]:
 
         already_hinted_locations = set()
 
+        # Excluded locations should never be hinted
+
+        already_hinted_locations |= {
+            location.name for location in self.multiworld.get_locations(self.player)
+            if location.progress_type == LocationProgressType.EXCLUDED
+        }
+
         # Laser hints
 
         if self.options.laser_hints:

worlds/witness/data/static_items.py

@@ -8,11 +8,22 @@
 
 ITEM_DATA: Dict[str, ItemData] = {}
 ITEM_GROUPS: Dict[str, Set[str]] = {}
+POSSIBLE_ITEMS: Set[str] = set()
 
 # Useful items that are treated specially at generation time and should not be automatically added to the player's
 # item list during get_progression_items.
 _special_usefuls: List[str] = ["Puzzle Skip"]
 
+_impossible_items: Set[str] = {
+    "Dots",
+    "Full Dots",
+    "Symmetry",
+    "Colored Dots",
+    "Stars",
+    "Stars + Same Colored Symbol",
+    "Invisible Dots"
+}
+
 ALWAYS_GOOD_SYMBOL_ITEMS: Set[str] = {"Dots", "Black/White Squares", "Symmetry", "Shapers", "Stars"}
 
 MODE_SPECIFIC_GOOD_ITEMS: Dict[str, Set[str]] = {
@@ -59,6 +70,9 @@ def populate_items() -> None:
         ITEM_DATA[item_name] = ItemData(ap_item_code, definition,
                                         classification, local_only)
 
+        if item_name not in _impossible_items:
+            POSSIBLE_ITEMS.add(item_name)
+
 
 def get_item_to_door_mappings() -> Dict[int, List[int]]:
     output: Dict[int, List[int]] = {}

worlds/witness/data/static_locations.py

@@ -1,6 +1,7 @@
-from typing import Dict, Set, cast
+from typing import Dict, List, Set, cast
 
 from . import static_logic as static_witness_logic
+from . import utils
 
 ID_START = 158000
 
@@ -453,6 +454,15 @@
 
 AREA_LOCATION_GROUPS: Dict[str, Set[str]] = {}
 
+POSSIBLE_LOCATIONS: Set[str] = set()
+
+EXTRA_LOCATIONS: List[str] = [
+    "Tutorial First Hallway Bend",
+    "Tutorial First Hallway Straight",
+    "Desert Surface 1",
+    "Desert Surface 2",
+]
+
 
 def get_id(entity_hex: str) -> int:
     """
@@ -488,3 +498,13 @@ def get_event_name(entity_hex: str) -> str:
 for loc in ALL_LOCATIONS_TO_IDS:
     area = static_witness_logic.ENTITIES_BY_NAME[loc]["area"]["name"]
     AREA_LOCATION_GROUPS.setdefault(area, set()).add(loc)
+
+POSSIBLE_LOCATIONS |= GENERAL_LOCATIONS
+POSSIBLE_LOCATIONS.update(EXTRA_LOCATIONS)
+
+door_shuffle_line_gen = (line for line in utils.get_complex_doors())
+for line in door_shuffle_line_gen:
+    if line.startswith("Added Locations"):
+        break
+
+POSSIBLE_LOCATIONS.update([line.strip() for line in door_shuffle_line_gen])