Implemented the new FieldResolvers

Author: Ishigh1

rule_builder/rules.py

@@ -1353,7 +1353,7 @@ class HasFromList(Rule[TWorld], game="Archipelago"):
     def __init__(
         self,
         *item_names: str,
-        count: int = 1,
+        count: int | FieldResolver = 1,
         options: Iterable[OptionFilter] = (),
         filtered_resolution: bool = False,
     ) -> None:
@@ -1487,7 +1487,7 @@ class HasFromListUnique(Rule[TWorld], game="Archipelago"):
     def __init__(
         self,
         *item_names: str,
-        count: int = 1,
+        count: int | FieldResolver = 1,
         options: Iterable[OptionFilter] = (),
         filtered_resolution: bool = False,
     ) -> None:

worlds/tloz_oos/Options.py

@@ -369,7 +369,7 @@ class OracleOfSeasonsRemoveD2AltEntrance(Toggle):
     include_in_slot_data = True
 
 
-class OraclesOfSeasonsTreehouseOldManRequirement(Range):
+class OracleOfSeasonsTreehouseOldManRequirement(Range):
     """
     The amount of essences that you need to bring to the treehouse old man for him to give his item.
     """
@@ -383,7 +383,7 @@ class OraclesOfSeasonsTreehouseOldManRequirement(Range):
     include_in_slot_data = True
 
 
-class OraclesOfSeasonsTarmGateRequirement(Range):
+class OracleOfSeasonsTarmGateRequirement(Range):
     """
     The number of jewels that you need to bring to Tarm Ruins gate to be able to open it.
     """
@@ -397,7 +397,7 @@ class OraclesOfSeasonsTarmGateRequirement(Range):
     include_in_slot_data = True
 
 
-class OraclesOfSeasonsGoldenBeastsRequirement(Range):
+class OracleOfSeasonsGoldenBeastsRequirement(Range):
     """
     The amount of golden beasts that need to be beaten for the golden old man to give his item.
     Golden beasts are 4 unique enemies that appear at specific spots on specific seasons, and beating all four of them
@@ -803,9 +803,9 @@ class OracleOfSeasonsOptions(PerGameCommonOptions):
     starting_maps_compasses: OracleOfSeasonsStartingMapsCompasses
 
     # Numeric requirements for some checks / access to regions
-    treehouse_old_man_requirement: OraclesOfSeasonsTreehouseOldManRequirement
-    tarm_gate_required_jewels: OraclesOfSeasonsTarmGateRequirement
-    golden_beasts_requirement: OraclesOfSeasonsGoldenBeastsRequirement
+    treehouse_old_man_requirement: OracleOfSeasonsTreehouseOldManRequirement
+    tarm_gate_required_jewels: OracleOfSeasonsTarmGateRequirement
+    golden_beasts_requirement: OracleOfSeasonsGoldenBeastsRequirement
     sign_guy_requirement: OracleOfSeasonsSignGuyRequirement
     gasha_nut_kill_requirement: OracleOfSeasonsGashaNutKillRequirement
 
@@ -884,9 +884,9 @@ class OracleOfSeasonsOptions(PerGameCommonOptions):
         OracleOfSeasonsStartingMapsCompasses
     ]),
     OptionGroup("Numeric Requirements", [
-        OraclesOfSeasonsTreehouseOldManRequirement,
-        OraclesOfSeasonsTarmGateRequirement,
-        OraclesOfSeasonsGoldenBeastsRequirement,
+        OracleOfSeasonsTreehouseOldManRequirement,
+        OracleOfSeasonsTarmGateRequirement,
+        OracleOfSeasonsGoldenBeastsRequirement,
         OracleOfSeasonsSignGuyRequirement,
         OracleOfSeasonsGashaNutKillRequirement,
     ]),

worlds/tloz_oos/data/Constants.py

@@ -204,6 +204,7 @@
     "subrosianMarket3": 40,
     "subrosianMarket4": 50,
     "subrosianMarket5": 60,
+    "subrosianMarket": 180,
     "spoolSwampScrub": 100,
     "samasaCaveScrub": 100,
     "d2Scrub": 30,
@@ -439,25 +440,6 @@
     ]
 }
 
-GASHA_SPOT_REGIONS = [
-    "impa gasha spot",
-    "horon gasha spot",
-    "suburbs gasha spot",
-    "holodrum plain gasha spot",
-    "holodrum plain island gasha spot",
-    "spool swamp north gasha spot",
-    "spool swamp south gasha spot",
-    "sunken city gasha spot",
-    "mt cucco gasha spot",
-    "goron mountain left gasha spot",
-    "goron mountain right gasha spot",
-    "eyeglass lake gasha spot",
-    "tarm ruins gasha spot",
-    "western coast gasha spot",
-    "samasa desert gasha spot",
-    "onox gasha spot",
-]
-
 TREASURE_SPAWN_INSTANT = 0x00
 TREASURE_SPAWN_POOF = 0x10
 TREASURE_SPAWN_DROP = 0x20

worlds/tloz_oos/data/Regions.py

@@ -46,7 +46,39 @@
     "d11 floor 5 boomerang maze",
     "d11 final chest"
 ]
-
+SCRUB_REGIONS = [
+    "spool swamp scrub",
+    "samasa desert scrub",
+    "d2 scrub",
+    "d4 scrub",
+]
+GASHA_SPOT_REGIONS = [
+    "impa gasha spot",
+    "horon gasha spot",
+    "suburbs gasha spot",
+    "holodrum plain gasha spot",
+    "holodrum plain island gasha spot",
+    "spool swamp north gasha spot",
+    "spool swamp south gasha spot",
+    "sunken city gasha spot",
+    "mt cucco gasha spot",
+    "goron mountain left gasha spot",
+    "goron mountain right gasha spot",
+    "eyeglass lake gasha spot",
+    "tarm ruins gasha spot",
+    "western coast gasha spot",
+    "samasa desert gasha spot",
+    "onox gasha spot",
+]
+SECRET_REGIONS = [
+    "clock shop secret",
+    "graveyard secret",
+    "subrosian secret",
+    "diver secret",
+    "smith secret",
+    "natzu deku",
+    "deku secret"
+]
 REGIONS = [
     "impa's house",
     "horon village",
@@ -55,7 +87,6 @@
     "horon village SE chest",
     "horon village SW chest",
     "horon heart piece",
-    "advance shop",
     "dr. left reward",
     "old man trade",
     "malon trade",
@@ -130,7 +161,6 @@
     "spool swamp tree",
     "floodgate keeper's house",
     "floodgate keyhole",
-    "spool swamp scrub",
     "spool stump",
     "d3 entrance",
     "d1 island",
@@ -183,7 +213,6 @@
     "samasa desert",
     "samasa desert pit",
     "samasa desert chest",
-    "samasa desert scrub",
     "temple remains lower stump",
     "temple remains upper stump",
     "temple remains lower portal",
@@ -258,7 +287,6 @@
     "d2 rope chest",
     "d2 blade chest",
     "d2 alt entrances",
-    "d2 scrub",
     "d2 roller chest",
     "d2 spiral chest",
     "d2 spinner",
@@ -297,7 +325,6 @@
     "greater distance owl",
     "d4 stalfos stairs",
     "d4 terrace",
-    "d4 scrub",
     "d4 miniboss room",
     "d4 final minecart",
     "d4 torch chest",
@@ -414,29 +441,4 @@
     "subrosia market digging spot",
     "subrosia temple digging spot",
     "subrosia bridge digging spot",
-
-    "impa gasha spot",
-    "horon gasha spot",
-    "suburbs gasha spot",
-    "holodrum plain gasha spot",
-    "holodrum plain island gasha spot",
-    "spool swamp north gasha spot",
-    "spool swamp south gasha spot",
-    "sunken city gasha spot",
-    "mt cucco gasha spot",
-    "goron mountain left gasha spot",
-    "goron mountain right gasha spot",
-    "eyeglass lake gasha spot",
-    "tarm ruins gasha spot",
-    "western coast gasha spot",
-    "samasa desert gasha spot",
-    "onox gasha spot",
-
-    "clock shop secret",
-    "graveyard secret",
-    "subrosian secret",
-    "diver secret",
-    "smith secret",
-    "natzu deku",
-    "deku secret"
 ]

worlds/tloz_oos/data/logic/DungeonsLogic.py

@@ -88,7 +88,7 @@ def make_d1_logic():
     ]
 
 
-def make_d2_logic():
+def make_d2_logic(options: OracleOfSeasonsOptions):
     return [
         # 0 keys
         ["enter d2", "d2 torch room", True, None],
@@ -125,7 +125,7 @@ def make_d2_logic():
                 )
             )
         )],
-        ["d2 alt entrances", "d2 scrub", False, oos_has_rupees_for_shop("d2Scrub")],
+        ["d2 alt entrances", "d2 scrub", False, oos_has_rupees_for_shop("d2Scrub"), options.shuffle_business_scrubs],
 
         # 2 keys
         ["d2 roller chest", "d2 spinner", False, And(
@@ -255,7 +255,7 @@ def make_d3_logic():
     ]
 
 
-def make_d4_logic():
+def make_d4_logic(options: OracleOfSeasonsOptions):
     return [
         # 0 keys
         ["enter d4", "d4 north of entrance", False, Or(
@@ -362,7 +362,7 @@ def make_d4_logic():
         )],
 
         ["d4 stalfos stairs", "d4 terrace", False, None],
-        ["d4 terrace", "d4 scrub", False, oos_has_rupees_for_shop("d4Scrub")],
+        ["d4 terrace", "d4 scrub", False, oos_has_rupees_for_shop("d4Scrub"), options.shuffle_business_scrubs],
 
         ["d4 stalfos stairs", "d4 torch chest", False, And(
             oos_has_seed_thrower(),

worlds/tloz_oos/data/logic/LogicPredicates.py

@@ -1,9 +1,12 @@
-from rule_builder.rules import And, Or, CanReachRegion
+from rule_builder.field_resolvers import FromOption
+from rule_builder.rules import And, Or, CanReachRegion, AtLeast
 from .Rulebuilder import *
 from ..Constants import *
+from ..Regions import GASHA_SPOT_REGIONS
 from ...Options import OracleOfSeasonsLogicDifficulty, OracleOfSeasonsDefaultSeedType, OracleOfSeasonsMasterKeys, OracleOfSeasonsDungeonShuffle, \
     OracleOfSeasonsRemoveD0AltEntrance, OracleOfSeasonsRemoveD2AltEntrance, OracleOfSeasonsAnimalCompanion, OracleOfSeasonsLostWoodsItemSequence, \
-    OracleOfSeasonsLostWoodsMainSequence, OracleOfSeasonsHoronSeason
+    OracleOfSeasonsLostWoodsMainSequence, OracleOfSeasonsHoronSeason, OracleOfSeasonsRequiredEssences, OracleOfSeasonsTreehouseOldManRequirement, \
+    OracleOfSeasonsTarmGateRequirement, OracleOfSeasonsGoldenBeastsRequirement
 
 
 # Items predicates ############################################################
@@ -225,7 +228,7 @@ def oos_is_companion_dimitri() -> Rule:
 
 
 def oos_is_default_season(area_name: str, season: int, is_season: bool = True) -> Rule:
-    return Season(area_name, season, is_season)
+    return from_world_field(f"default_seasons.{area_name}", season, "eq" if is_season else "ne")
 
 
 def oos_can_remove_season(season: int) -> Rule:
@@ -240,15 +243,15 @@ def oos_has_essences(target_count: int) -> Rule:
 
 
 def oos_has_essences_for_maku_seed() -> Rule:
-    return HasGroupOption("Essences", "required_essences")
+    return HasGroup("Essences", FromOption(OracleOfSeasonsRequiredEssences))
 
 
 def oos_has_essences_for_treehouse() -> Rule:
-    return HasGroupOption("Essences", "treehouse_old_man_requirement")
+    return HasGroup("Essences", FromOption(OracleOfSeasonsTreehouseOldManRequirement))
 
 
 def oos_has_required_jewels() -> Rule:
-    return HasGroupOption("Jewels", "tarm_gate_required_jewels")
+    return HasGroup("Jewels", FromOption(OracleOfSeasonsTarmGateRequirement))
 
 
 def oos_can_reach_lost_woods_pedestal(allow_default: bool = False) -> Rule:
@@ -280,14 +283,14 @@ def oos_can_complete_lost_woods_main_sequence(allow_default: bool = False) -> Ru
 
 
 def oos_can_beat_required_golden_beasts() -> Rule:
-    return HasFromListOption("_beat_golden_darknut", "_beat_golden_lynel", "_beat_golden_moblin", "_beat_golden_octorok",
-                             option_name="golden_beasts_requirement")
+    return HasFromList("_beat_golden_darknut", "_beat_golden_lynel", "_beat_golden_moblin", "_beat_golden_octorok",
+                             count=FromOption(OracleOfSeasonsGoldenBeastsRequirement))
 
 
 def oos_can_complete_d11_puzzle() -> Rule:
     return Or(
         from_option(OracleOfSeasonsDungeonShuffle, OracleOfSeasonsDungeonShuffle.option_false),
-        CanReachNumRegions([f"enter d{i}" for i in range(1, 9)], 7)  # And then deduce the last
+        AtLeast(7, *[CanReachRegion(f"enter d{i}") for i in range(1, 9)])  # And then deduce the last
     )
 
 
@@ -298,7 +301,11 @@ def oos_has_rupees_for_shop(shop_name: str) -> Rule:
             oos_option_hard_logic(),
             oos_has_shovel()
         ),
-        HasRupeesForShop(shop_name)
+        from_world_field(f"shop_rupee_requirements.{shop_name}", 0, "eq"),
+        And(
+            oos_can_farm_rupees(),
+            Has("Rupees", FromWorldAttr(f"shop_rupee_requirements.{shop_name}"))
+        )
     )
 
 
@@ -311,7 +318,16 @@ def oos_can_farm_rupees() -> Rule:
 
 
 def oos_can_buy_market() -> Rule:
-    return HasOresForShop()
+    return Or(
+        from_world_field(f"shop_prices.subrosianMarket", 0, "eq"),
+        And(
+            oos_can_farm_ore_chunks(),
+            Or(
+                Has("Ore Chunks", FromWorldAttr(f"shop_prices.subrosianMarket")),
+                from_option(OracleOfSeasonsGoldenOreSpotsShuffle, OracleOfSeasonsGoldenOreSpotsShuffle.option_false, "eq"),
+            )
+        )
+    )
 
 
 def oos_can_farm_ore_chunks() -> Rule:
@@ -1324,7 +1340,7 @@ def oos_roosters(region: str, any_amount: int = 0, top_amount: int = 0, bottom_a
                 oos_roosters("horon", any_amount + 1, top_amount, bottom_amount, set(visited_regions)),
                 oos_season_in_eyeglass_lake(SEASON_WINTER),
                 Or(
-                    Season("EYEGLASS_LAKE", SEASON_SUMMER, True),
+                    oos_is_default_season("EYEGLASS_LAKE", SEASON_SUMMER, True),
                     oos_can_remove_season(SEASON_SUMMER)
                 ),
                 oos_can_swim(True)