Implement astalon logic with core rule builder

worlds/astalon/bases.py

@@ -1,27 +1,14 @@
-from abc import ABCMeta
-from collections import defaultdict
-from typing import TYPE_CHECKING, Any, ClassVar
+from typing import ClassVar
 
 from BaseClasses import MultiWorld
-from worlds.AutoWorld import AutoWorldRegister, World
+from worlds.AutoWorld import World
 
 from .items import Character, EarlyItems
 from .options import AstalonOptions
 from .settings import AstalonSettings
 
-if TYPE_CHECKING:
-    from .logic.instances import RuleInstance
 
-
-# TODO: remove once ap 0.6.6 is released
-class AstalonWorldMetaclass(AutoWorldRegister, ABCMeta):
-    def __new__(mcs, name: str, bases: tuple[type, ...], dct: dict[str, Any]) -> AutoWorldRegister:
-        if name == "AstalonWorld":
-            return super().__new__(mcs, name, bases, dct)
-        return super(AutoWorldRegister, mcs).__new__(mcs, name, bases, dct)
-
-
-class AstalonWorldBase(World, metaclass=AstalonWorldMetaclass):
+class AstalonWorldBase(World):
     options_dataclass = AstalonOptions
     settings: ClassVar[AstalonSettings]  # pyright: ignore[reportIncompatibleVariableOverride]
 
@@ -31,12 +18,7 @@ class AstalonWorldBase(World, metaclass=AstalonWorldMetaclass):
     early_items: EarlyItems
     portal_pairs: tuple[tuple[str, str], ...] = ()
 
-    rule_cache: "dict[int, RuleInstance]"
-    _rule_deps: dict[str, set[int]]
-
     def __init__(self, multiworld: MultiWorld, player: int) -> None:
         super().__init__(multiworld, player)
         self.starting_characters = []
         self.early_items = EarlyItems()
-        self.rule_cache = {}
-        self._rule_deps = defaultdict(set)

worlds/astalon/constants.py

@@ -1,4 +1,3 @@
 from typing import Final
 
 GAME_NAME: Final[str] = "Astalon"
-BASE_ID: Final[int] = 333000

worlds/astalon/items.py

@@ -3,15 +3,12 @@
 from enum import StrEnum
 from functools import cached_property
 from itertools import groupby
-from typing import TYPE_CHECKING, TypeAlias
+from typing import TypeAlias
 
 from BaseClasses import Item, ItemClassification
 
-from .constants import BASE_ID, GAME_NAME
-from .options import StartingLocation
-
-if TYPE_CHECKING:
-    from . import AstalonWorld
+from .constants import GAME_NAME
+from .options import AstalonOptions, StartingLocation
 
 
 class ItemGroup(StrEnum):
@@ -529,7 +526,7 @@ class AstalonItem(Item):
 @dataclass(frozen=True)
 class ItemData:
     name: ItemName
-    classification: ItemClassification | Callable[["AstalonWorld"], ItemClassification]
+    classification: ItemClassification | Callable[[AstalonOptions], ItemClassification]
     quantity_in_item_pool: int
     group: ItemGroup
     description: str = ""
@@ -615,11 +612,9 @@ class ItemData:
     ItemData(BlueDoor.CAVES, ItemClassification.progression, 1, ItemGroup.DOOR_BLUE),
     ItemData(
         BlueDoor.CATA_ORBS,
-        lambda world: (
-            ItemClassification.progression
-            if world.options.randomize_candles or world.options.randomize_orb_multipliers
-            else ItemClassification.useful
-        ),
+        lambda options: ItemClassification.progression
+        if options.randomize_candles or options.randomize_orb_multipliers
+        else ItemClassification.useful,
         1,
         ItemGroup.DOOR_BLUE,
     ),
@@ -630,9 +625,7 @@ class ItemData:
     ItemData(BlueDoor.CATA_PRISON_LEFT, ItemClassification.filler, 1, ItemGroup.DOOR_BLUE),
     ItemData(
         BlueDoor.CATA_PRISON_RIGHT,
-        lambda world: (
-            ItemClassification.progression if world.options.randomize_candles else ItemClassification.filler
-        ),
+        lambda options: ItemClassification.progression if options.randomize_candles else ItemClassification.filler,
         1,
         ItemGroup.DOOR_BLUE,
     ),
@@ -691,21 +684,17 @@ class ItemData:
     ItemData(Switch.GT_UPPER_PATH_ACCESS, ItemClassification.progression, 1, ItemGroup.SWITCH),
     ItemData(
         Switch.GT_CROSSES,
-        lambda world: (
-            ItemClassification.filler
-            if world.options.open_early_doors and world.options.starting_location == StartingLocation.option_gorgon_tomb
-            else ItemClassification.progression
-        ),
+        lambda options: ItemClassification.filler
+        if options.open_early_doors and options.starting_location == StartingLocation.option_gorgon_tomb
+        else ItemClassification.progression,
         1,
         ItemGroup.SWITCH,
     ),
     ItemData(
         Switch.GT_GH_SHORTCUT,
-        lambda world: (
-            ItemClassification.filler
-            if world.options.open_early_doors and world.options.starting_location == StartingLocation.option_gorgon_tomb
-            else ItemClassification.progression
-        ),
+        lambda options: ItemClassification.filler
+        if options.open_early_doors and options.starting_location == StartingLocation.option_gorgon_tomb
+        else ItemClassification.progression,
         1,
         ItemGroup.SWITCH,
     ),
@@ -904,8 +893,8 @@ class ItemData:
     ItemData(Orbs.ORB_MULTI, ItemClassification.useful, 3, ItemGroup.ORBS),
 )
 
-item_table = {item.name.value: item for item in ALL_ITEMS}
-item_name_to_id: dict[str, int] = {data.name.value: i for i, data in enumerate(ALL_ITEMS, start=BASE_ID)}
+item_table: dict[str, ItemData] = {item.name.value: item for item in ALL_ITEMS}
+item_name_to_id: dict[str, int] = {data.name.value: i for i, data in enumerate(ALL_ITEMS, start=1)}
 
 
 def get_item_group(item_name: str) -> ItemGroup:

worlds/astalon/locations.py

@@ -4,7 +4,7 @@
 
 from BaseClasses import Location
 
-from .constants import BASE_ID, GAME_NAME
+from .constants import GAME_NAME
 from .regions import RegionName
 
 
@@ -517,7 +517,7 @@ class LocationName(StrEnum):
 
 
 class AstalonLocation(Location):
-    game: str = GAME_NAME
+    game = GAME_NAME
 
 
 @dataclass(frozen=True)
@@ -1116,8 +1116,8 @@ class LocationData:
     LocationData(LocationName.CATA_ORB_MULTI, RegionName.CATA_MULTI, LocationGroup.ORBS, Area.CATA),
 )
 
-location_table = {location.name.value: location for location in ALL_LOCATIONS}
-location_name_to_id: dict[str, int] = {data.name.value: i for i, data in enumerate(ALL_LOCATIONS, start=BASE_ID)}
+location_table: dict[str, LocationData] = {location.name.value: location for location in ALL_LOCATIONS}
+location_name_to_id: dict[str, int] = {data.name.value: i for i, data in enumerate(ALL_LOCATIONS, start=1)}
 
 
 def get_location_group(location_name: str) -> LocationGroup:

worlds/astalon/logic/__init__.py

@@ -1,10 +0,0 @@
-from .instances import RuleInstance
-from .main_campaign import MAIN_ENTRANCE_RULES, MAIN_LOCATION_RULES
-from .mixin import AstalonLogicMixin
-
-__all__ = (
-    "MAIN_ENTRANCE_RULES",
-    "MAIN_LOCATION_RULES",
-    "AstalonLogicMixin",
-    "RuleInstance",
-)