cleanup + act plando fixes

worlds/ahit/DeathWishLocations.py

@@ -2,10 +2,12 @@
 from .Regions import connect_regions, create_region
 from BaseClasses import Region, LocationProgressType, ItemClassification
 from worlds.generic.Rules import add_rule
-from worlds.AutoWorld import World
-from typing import List
+from typing import List, TYPE_CHECKING
 from .Locations import death_wishes
 
+if TYPE_CHECKING:
+    from . import HatInTimeWorld
+
 
 dw_prereqs = {
     "So You're Back From Outer Space":  ["Beat the Heat"],
@@ -81,17 +83,17 @@
     "So You're Back From Outer Space",
     "Encore! Encore!",
     "Snatcher's Hit List",
-	"Vault Codes in the Wind",
+    "Vault Codes in the Wind",
     "10 Seconds until Self-Destruct",
     "Killing Two Birds",
     "Zero Jumps",
-	"Boss Rush",
+    "Boss Rush",
     "Bird Sanctuary",
-	"The Mustache Gauntlet",
+    "The Mustache Gauntlet",
     "Wound-Up Windmill",
-	"Camera Tourist",
-	"Rift Collapse: Deep Sea",
-	"Cruisin' for a Bruisin'",
+    "Camera Tourist",
+    "Rift Collapse: Deep Sea",
+    "Cruisin' for a Bruisin'",
     "Seal the Deal",
 ]
 
@@ -144,7 +146,7 @@
 }
 
 
-def create_dw_regions(world: World):
+def create_dw_regions(world: "HatInTimeWorld"):
     if world.options.DWExcludeAnnoyingContracts.value > 0:
         for name in annoying_dws:
             world.get_excluded_dws().append(name)

worlds/ahit/DeathWishRules.py

@@ -1,13 +1,17 @@
-from worlds.AutoWorld import World, CollectionState
+from worlds.AutoWorld import CollectionState
 from .Rules import can_use_hat, can_use_hookshot, can_hit, zipline_logic, get_difficulty, has_paintings
 from .Types import HatType, Difficulty, HatInTimeLocation, HatInTimeItem, LocData
 from .DeathWishLocations import dw_prereqs, dw_candles
 from BaseClasses import Entrance, Location, ItemClassification
 from worlds.generic.Rules import add_rule, set_rule
-from typing import List, Callable
+from typing import List, Callable, TYPE_CHECKING
 from .Regions import act_chapters
 from .Locations import zero_jumps, zero_jumps_expert, zero_jumps_hard, death_wishes
 
+if TYPE_CHECKING:
+    from . import HatInTimeWorld
+
+
 # Any speedruns expect the player to have Sprint Hat
 dw_requirements = {
     "Beat the Heat": LocData(umbrella=True),
@@ -98,7 +102,7 @@
 }
 
 
-def set_dw_rules(world: World):
+def set_dw_rules(world: "HatInTimeWorld"):
     if "Snatcher's Hit List" not in world.get_excluded_dws() \
        or "Camera Tourist" not in world.get_excluded_dws():
         set_enemy_rules(world)
@@ -221,7 +225,7 @@ def set_dw_rules(world: World):
                                                                                       world.player)
 
 
-def modify_dw_rules(world: World, name: str):
+def modify_dw_rules(world: "HatInTimeWorld", name: str):
     difficulty: Difficulty = get_difficulty(world)
     main_objective = world.multiworld.get_location(f"{name} - Main Objective", world.player)
     full_clear = world.multiworld.get_location(f"{name} - All Clear", world.player)
@@ -267,7 +271,7 @@ def modify_dw_rules(world: World, name: str):
         set_candle_dw_rules(name, world)
 
 
-def get_total_dw_stamps(state: CollectionState, world: World) -> int:
+def get_total_dw_stamps(state: CollectionState, world: "HatInTimeWorld") -> int:
     if world.options.DWShuffle.value > 0:
         return 999  # no stamp costs in death wish shuffle
 
@@ -290,7 +294,7 @@ def get_total_dw_stamps(state: CollectionState, world: World) -> int:
     return count
 
 
-def set_candle_dw_rules(name: str, world: World):
+def set_candle_dw_rules(name: str, world: "HatInTimeWorld"):
     main_objective = world.multiworld.get_location(f"{name} - Main Objective", world.player)
     full_clear = world.multiworld.get_location(f"{name} - All Clear", world.player)
 
@@ -327,7 +331,7 @@ def set_candle_dw_rules(name: str, world: World):
             add_rule(full_clear, lambda state: state.has(coin, world.player))
 
 
-def get_zero_jump_clear_count(state: CollectionState, world: World) -> int:
+def get_zero_jump_clear_count(state: CollectionState, world: "HatInTimeWorld") -> int:
     total: int = 0
 
     for name in act_chapters.keys():
@@ -349,7 +353,7 @@ def get_zero_jump_clear_count(state: CollectionState, world: World) -> int:
     return total
 
 
-def get_reachable_enemy_count(state: CollectionState, world: World) -> int:
+def get_reachable_enemy_count(state: CollectionState, world: "HatInTimeWorld") -> int:
     count: int = 0
     for enemy in hit_list.keys():
         if enemy in bosses:
@@ -361,15 +365,15 @@ def get_reachable_enemy_count(state: CollectionState, world: World) -> int:
     return count
 
 
-def can_reach_all_bosses(state: CollectionState, world: World) -> bool:
+def can_reach_all_bosses(state: CollectionState, world: "HatInTimeWorld") -> bool:
     for boss in bosses:
         if not state.has(boss, world.player):
             return False
 
     return True
 
 
-def create_enemy_events(world: World):
+def create_enemy_events(world: "HatInTimeWorld"):
     no_tourist = "Camera Tourist" in world.get_excluded_dws() or "Camera Tourist" in world.get_excluded_bonuses()
 
     for enemy, regions in hit_list.items():
@@ -413,7 +417,7 @@ def create_enemy_events(world: World):
             add_rule(event, lambda state: can_use_hookshot(state, world) and can_use_hat(state, world, HatType.DWELLER))
 
 
-def set_enemy_rules(world: World):
+def set_enemy_rules(world: "HatInTimeWorld"):
     no_tourist = "Camera Tourist" in world.get_excluded_dws() or "Camera Tourist" in world.get_excluded_bonuses()
 
     for enemy, regions in hit_list.items():

worlds/ahit/Items.py

@@ -1,12 +1,14 @@
 from BaseClasses import Item, ItemClassification
-from worlds.AutoWorld import World
 from .Types import HatDLC, HatType, hat_type_to_item, Difficulty, ItemData, HatInTimeItem
 from .Locations import get_total_locations
 from .Rules import get_difficulty
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, TYPE_CHECKING
 
+if TYPE_CHECKING:
+    from . import HatInTimeWorld
 
-def create_itempool(world: World) -> List[Item]:
+
+def create_itempool(world: "HatInTimeWorld") -> List[Item]:
     itempool: List[Item] = []
     if not world.is_dw_only() and world.options.HatItems.value == 0:
         calculate_yarn_costs(world)
@@ -87,7 +89,7 @@ def create_itempool(world: World) -> List[Item]:
     return itempool
 
 
-def calculate_yarn_costs(world: World):
+def calculate_yarn_costs(world: "HatInTimeWorld"):
     mw = world.multiworld
     min_yarn_cost = int(min(world.options.YarnCostMin.value, world.options.YarnCostMax.value))
     max_yarn_cost = int(max(world.options.YarnCostMin.value, world.options.YarnCostMax.value))
@@ -107,7 +109,7 @@ def calculate_yarn_costs(world: World):
         world.options.YarnAvailable.value += (max_cost + world.options.MinExtraYarn.value) - available_yarn
 
 
-def item_dlc_enabled(world: World, name: str) -> bool:
+def item_dlc_enabled(world: "HatInTimeWorld", name: str) -> bool:
     data = item_table[name]
 
     if data.dlc_flags == HatDLC.none:
@@ -122,12 +124,12 @@ def item_dlc_enabled(world: World, name: str) -> bool:
     return False
 
 
-def create_item(world: World, name: str) -> Item:
+def create_item(world: "HatInTimeWorld", name: str) -> Item:
     data = item_table[name]
     return HatInTimeItem(name, data.classification, data.code, world.player)
 
 
-def create_multiple_items(world: World, name: str, count: int = 1,
+def create_multiple_items(world: "HatInTimeWorld", name: str, count: int = 1,
                           item_type: Optional[ItemClassification] = ItemClassification.progression) -> List[Item]:
 
     data = item_table[name]
@@ -139,7 +141,7 @@ def create_multiple_items(world: World, name: str, count: int = 1,
     return itemlist
 
 
-def create_junk_items(world: World, count: int) -> List[Item]:
+def create_junk_items(world: "HatInTimeWorld", count: int) -> List[Item]:
     trap_chance = world.options.TrapChance.value
     junk_pool: List[Item] = []
     junk_list: Dict[str, int] = {}

worlds/ahit/Locations.py

@@ -1,11 +1,14 @@
-from worlds.AutoWorld import World
 from .Types import HatDLC, HatType, LocData, Difficulty
-from typing import Dict
+from typing import Dict, TYPE_CHECKING
 from .Options import TasksanityCheckCount
 
+if TYPE_CHECKING:
+    from . import HatInTimeWorld
+
 TASKSANITY_START_ID = 2000300204
 
-def get_total_locations(world: World) -> int:
+
+def get_total_locations(world: "HatInTimeWorld") -> int:
     total: int = 0
 
     if not world.is_dw_only():
@@ -34,7 +37,7 @@ def get_total_locations(world: World) -> int:
     return total
 
 
-def location_dlc_enabled(world: World, location: str) -> bool:
+def location_dlc_enabled(world: "HatInTimeWorld", location: str) -> bool:
     data = location_table.get(location) or event_locs.get(location)
 
     if data.dlc_flags == HatDLC.none:
@@ -53,7 +56,7 @@ def location_dlc_enabled(world: World, location: str) -> bool:
     return False
 
 
-def is_location_valid(world: World, location: str) -> bool:
+def is_location_valid(world: "HatInTimeWorld", location: str) -> bool:
     if not location_dlc_enabled(world, location):
         return False
 

worlds/ahit/Options.py

@@ -1,10 +1,13 @@
-from typing import List
+from typing import List, TYPE_CHECKING
 from dataclasses import dataclass
-from worlds.AutoWorld import World, PerGameCommonOptions
+from worlds.AutoWorld import PerGameCommonOptions
 from Options import Range, Toggle, DeathLink, Choice, OptionDict
 
+if TYPE_CHECKING:
+    from . import HatInTimeWorld
+
 
-def adjust_options(world: World):
+def adjust_options(world: "HatInTimeWorld"):
     world.options.HighestChapterCost.value = max(
         world.options.HighestChapterCost.value,
         world.options.LowestChapterCost.value)
@@ -81,7 +84,7 @@ def adjust_options(world: World):
         world.options.DWTimePieceRequirement.value = 0
 
 
-def get_total_time_pieces(world: World) -> int:
+def get_total_time_pieces(world: "HatInTimeWorld") -> int:
     count: int = 40
     if world.is_dlc1():
         count += 6
@@ -566,13 +569,13 @@ class DWExcludeAnnoyingBonuses(Toggle):
     - Zero Jumps
     - Bird Sanctuary
     - Wound-Up Windmill
-	- Vault Codes in the Wind
+    - Vault Codes in the Wind
     - Boss Rush
     - Camera Tourist
     - The Mustache Gauntlet
     - Rift Collapse: Deep Sea
     - Cruisin' for a Bruisin'
-	- Seal the Deal"""
+    - Seal the Deal"""
     display_name = "Exclude Annoying Death Wish Full Completions"
     default = 1