bulk commit -> first playable beta

worlds/zork_grand_inquisitor/client.py

@@ -8,8 +8,11 @@
 
 from .data_funcs import (
     item_names_to_id,
+    item_names_to_item,
     location_names_to_id,
+    id_to_deathsanity,
     id_to_items,
+    id_to_landmarksanity,
     id_to_locations,
     id_to_goals,
     id_to_starting_locations,
@@ -100,15 +103,27 @@ def on_package(self, cmd: str, _args: Any) -> None:
 
             # Options
             self.game_controller.option_goal = id_to_goals()[_args["slot_data"]["goal"]]
-            self.game_controller.option_deathsanity = _args["slot_data"]["deathsanity"] == 1
+
+            self.game_controller.option_starting_location = (
+                id_to_starting_locations()[_args["slot_data"]["starting_location"]]
+            )
+
+            self.game_controller.option_deathsanity = (
+                id_to_deathsanity()[_args["slot_data"]["deathsanity"]]
+            )
+
+            self.game_controller.option_landmarksanity = (
+                id_to_landmarksanity()[_args["slot_data"]["landmarksanity"]]
+            )
 
             self.game_controller.option_grant_missable_location_checks = (
                 _args["slot_data"]["grant_missable_location_checks"] == 1
             )
 
-            self.game_controller.option_starting_location = (
-                id_to_starting_locations()[_args["slot_data"]["starting_location"]]
-            )
+            # Initial Totemizer Destination
+            self.game_controller.initial_totemizer_destination = item_names_to_item()[
+                _args["slot_data"]["initial_totemizer_destination"]
+            ]
 
     async def controller(self):
         while not self.exit_event.is_set():

worlds/zork_grand_inquisitor/data/missable_location_grant_conditions_data.py → worlds/zork_grand_inquisitor/data/missable_location_data.py

@@ -4,7 +4,8 @@
 
 
 class ZorkGrandInquisitorMissableLocationGrantConditionsData(NamedTuple):
-    location_condition: ZorkGrandInquisitorLocations
+    game_location_condition: Optional[str]
+    location_condition: Tuple[ZorkGrandInquisitorLocations, ...]
     item_conditions: Optional[Tuple[ZorkGrandInquisitorItems, ...]]
 
 
@@ -13,187 +14,226 @@ class ZorkGrandInquisitorMissableLocationGrantConditionsData(NamedTuple):
 ] = {
     ZorkGrandInquisitorLocations.BOING_BOING_BOING:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON,
+            game_location_condition="dg3e",
+            location_condition=(ZorkGrandInquisitorLocations.FLYING_SNAPDRAGON,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.BONK:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.PROZORKED,
+            game_location_condition="dg2f",
+            location_condition=(ZorkGrandInquisitorLocations.PROZORKED,),
             item_conditions=(ZorkGrandInquisitorItems.HAMMER,),
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_ARRESTED_WITH_JACK:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.ARREST_THE_VANDAL,
+            game_location_condition="pe6e",
+            location_condition=(ZorkGrandInquisitorLocations.ARREST_THE_VANDAL,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_ATTACKED_THE_QUELBEES:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES,
-            item_conditions=None,
-        )
-    ,
-    ZorkGrandInquisitorLocations.DEATH_EATEN_BY_A_GRUE:
-        ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.MAGIC_FOREVER,
+            game_location_condition="dg4f",
+            location_condition=(ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_LOST_GAME_OF_STRIP_GRUE_FIRE_WATER:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER,
+            game_location_condition="qs1e",
+            location_condition=(ZorkGrandInquisitorLocations.STRIP_GRUE_FIRE_WATER,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_LOST_SOUL_TO_OLD_SCRATCH:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.OLD_SCRATCH_WINNER,
+            game_location_condition=None,
+            location_condition=(ZorkGrandInquisitorLocations.OLD_SCRATCH_WINNER,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_OUTSMARTED_BY_THE_QUELBEES:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES,
+            game_location_condition="dg4f",
+            location_condition=(ZorkGrandInquisitorLocations.OUTSMART_THE_QUELBEES,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_SLICED_UP_BY_THE_INVISIBLE_GUARD:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,
+            game_location_condition="tp1e",
+            location_condition=(ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_STEPPED_INTO_THE_INFINITE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.A_SMALLWAY,
+            game_location_condition="th10",
+            location_condition=(ZorkGrandInquisitorLocations.A_SMALLWAY,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_SWALLOWED_BY_A_DRAGON:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.THAR_SHE_BLOWS,
+            game_location_condition="cd20",
+            location_condition=(ZorkGrandInquisitorLocations.THAR_SHE_BLOWS,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_YOURE_NOT_CHARON:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL,
+            game_location_condition="hp60",
+            location_condition=(ZorkGrandInquisitorLocations.OPEN_THE_GATES_OF_HELL,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DEATH_ZORK_ROCKS_EXPLODED:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.CRISIS_AVERTED,
+            game_location_condition="th3j",
+            location_condition=(ZorkGrandInquisitorLocations.CRISIS_AVERTED,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.DENIED_BY_THE_LAKE_MONSTER:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE,
+            game_location_condition="dc10",
+            location_condition=(ZorkGrandInquisitorLocations.WOW_IVE_NEVER_GONE_INSIDE_HIM_BEFORE,),
             item_conditions=(ZorkGrandInquisitorItems.SPELL_GOLGATEM,),
         )
     ,
     ZorkGrandInquisitorLocations.EMERGENCY_MAGICATRONIC_MESSAGE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED,
+            game_location_condition="th10",
+            location_condition=(ZorkGrandInquisitorLocations.ARTIFACTS_EXPLAINED,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.FAT_LOT_OF_GOOD_THATLL_DO_YA:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,
+            game_location_condition="tp1e",
+            location_condition=(ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,),
             item_conditions=(ZorkGrandInquisitorItems.SPELL_IGRAM,),
         )
     ,
     ZorkGrandInquisitorLocations.I_DONT_THINK_YOU_WOULDVE_WANTED_THAT_TO_WORK_ANYWAY:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.PROZORKED,
+            game_location_condition="dg2f",
+            location_condition=(ZorkGrandInquisitorLocations.PROZORKED,),
             item_conditions=(ZorkGrandInquisitorItems.SPELL_THROCK,),
         )
     ,
     ZorkGrandInquisitorLocations.I_SPIT_ON_YOUR_FILTHY_COINAGE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,
+            game_location_condition="tp1e",
+            location_condition=(ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,),
             item_conditions=(ZorkGrandInquisitorItems.POUCH_OF_ZORKMIDS,),
         )
     ,
     ZorkGrandInquisitorLocations.MEAD_LIGHT:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE,
+            game_location_condition="pe1e",
+            location_condition=(
+                ZorkGrandInquisitorLocations.FIRE_FIRE,
+                ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO,
+            ),
             item_conditions=(ZorkGrandInquisitorItems.MEAD_LIGHT,),
         )
     ,
     ZorkGrandInquisitorLocations.MUSHROOM_HAMMERED:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED,
+            game_location_condition="dg3e",
+            location_condition=(ZorkGrandInquisitorLocations.THROCKED_MUSHROOM_HAMMERED,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.NO_AUTOGRAPHS:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE,
+            game_location_condition="pe1e",
+            location_condition=(ZorkGrandInquisitorLocations.FIRE_FIRE,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.NO_BONDAGE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE,
-            item_conditions=(ZorkGrandInquisitorItems.ROPE,),
+            game_location_condition="pe20",
+            location_condition=(ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE,),
+            item_conditions=(
+                ZorkGrandInquisitorItems.WELL_ROPE,
+                ZorkGrandInquisitorItems.SPELL_GLORF,
+            ),
         )
     ,
     ZorkGrandInquisitorLocations.TALK_TO_ME_GRAND_INQUISITOR:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE,
+            game_location_condition="pe5e",
+            location_condition=(ZorkGrandInquisitorLocations.FIRE_FIRE,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.THATS_A_ROPE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE,
-            item_conditions=(ZorkGrandInquisitorItems.ROPE,),
+            game_location_condition="pe1e",
+            location_condition=(ZorkGrandInquisitorLocations.FIRE_FIRE,),
+            item_conditions=(
+                ZorkGrandInquisitorItems.WELL_ROPE,
+                ZorkGrandInquisitorItems.SPELL_GLORF,
+            ),
         )
     ,
     ZorkGrandInquisitorLocations.THATS_IT_JUST_KEEP_HITTING_THOSE_BUTTONS:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP,
+            game_location_condition="us2e",
+            location_condition=(ZorkGrandInquisitorLocations.ENJOY_YOUR_TRIP,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.THATS_STILL_A_ROPE:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,
-            item_conditions=(ZorkGrandInquisitorItems.SPELL_GLORF,),
+            game_location_condition="tp1e",
+            location_condition=(ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,),
+            item_conditions=(
+                ZorkGrandInquisitorItems.WELL_ROPE,
+                ZorkGrandInquisitorItems.SPELL_GLORF,
+            ),
         )
     ,
     ZorkGrandInquisitorLocations.WHAT_ARE_YOU_STUPID:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.FIRE_FIRE,
+            game_location_condition="pe1e",
+            location_condition=(
+                ZorkGrandInquisitorLocations.FIRE_FIRE,
+                ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE,
+            ),
             item_conditions=(ZorkGrandInquisitorItems.PLASTIC_SIX_PACK_HOLDER,),
         )
     ,
     ZorkGrandInquisitorLocations.YAD_GOHDNUORGREDNU_3_YRAUBORF:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG,
+            game_location_condition="dw10",
+            location_condition=(ZorkGrandInquisitorLocations.REASSEMBLE_SNAVIG,),
             item_conditions=None,
         )
     ,
     ZorkGrandInquisitorLocations.YOUR_PUNY_WEAPONS_DONT_PHASE_ME_BABY:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO,
+            game_location_condition="dv10",
+            location_condition=(ZorkGrandInquisitorLocations.WANT_SOME_RYE_COURSE_YA_DO,),
             item_conditions=(ZorkGrandInquisitorItems.SWORD, ZorkGrandInquisitorItems.HOTSPOT_HARRY),
         )
     ,
     ZorkGrandInquisitorLocations.YOU_DONT_GO_MESSING_WITH_A_MANS_ZIPPER:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,
+            game_location_condition="tp1e",
+            location_condition=(ZorkGrandInquisitorLocations.YOU_GAINED_86_EXPERIENCE_POINTS,),
             item_conditions=(ZorkGrandInquisitorItems.SPELL_REZROV,),
         )
     ,
     ZorkGrandInquisitorLocations.YOU_WANT_A_PIECE_OF_ME_DOCK_BOY:
         ZorkGrandInquisitorMissableLocationGrantConditionsData(
-            location_condition=ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE,
+            game_location_condition="pe20",
+            location_condition=(ZorkGrandInquisitorLocations.HELP_ME_CANT_BREATHE,),
             item_conditions=None,
         )
     ,

worlds/zork_grand_inquisitor/data/region_data.py

@@ -8,10 +8,11 @@ class ZorkGrandInquisitorRegionData(NamedTuple):
 
 
 region_data: Dict[ZorkGrandInquisitorRegions, ZorkGrandInquisitorRegionData] = {
+    ZorkGrandInquisitorRegions.ANYWHERE: ZorkGrandInquisitorRegionData(exits=None),
     ZorkGrandInquisitorRegions.CROSSROADS: ZorkGrandInquisitorRegionData(
         exits=(
             ZorkGrandInquisitorRegions.DM_LAIR,
-            ZorkGrandInquisitorRegions.GUE_TECH,
+            ZorkGrandInquisitorRegions.GUE_TECH_ENTRANCE,
             ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE,
             ZorkGrandInquisitorRegions.HADES_SHORE,
             ZorkGrandInquisitorRegions.PORT_FOOZLE,
@@ -44,19 +45,22 @@ class ZorkGrandInquisitorRegionData(NamedTuple):
         )
     ),
     ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO_DRAGON: ZorkGrandInquisitorRegionData(
-        exits=(
-            ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO,
-            ZorkGrandInquisitorRegions.ENDGAME,
-        )
+        exits=(ZorkGrandInquisitorRegions.DRAGON_ARCHIPELAGO,)
     ),
     ZorkGrandInquisitorRegions.ENDGAME: ZorkGrandInquisitorRegionData(exits=None),
     ZorkGrandInquisitorRegions.GUE_TECH: ZorkGrandInquisitorRegionData(
         exits=(
-            ZorkGrandInquisitorRegions.CROSSROADS,
+            ZorkGrandInquisitorRegions.GUE_TECH_ENTRANCE,
             ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY,
             ZorkGrandInquisitorRegions.GUE_TECH_OUTSIDE,
         )
     ),
+    ZorkGrandInquisitorRegions.GUE_TECH_ENTRANCE: ZorkGrandInquisitorRegionData(
+        exits=(
+            ZorkGrandInquisitorRegions.CROSSROADS,
+            ZorkGrandInquisitorRegions.GUE_TECH,
+        )
+    ),
     ZorkGrandInquisitorRegions.GUE_TECH_HALLWAY: ZorkGrandInquisitorRegionData(
         exits=(
             ZorkGrandInquisitorRegions.GUE_TECH,
@@ -126,10 +130,7 @@ class ZorkGrandInquisitorRegionData(NamedTuple):
         )
     ),
     ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST_TAVERN: ZorkGrandInquisitorRegionData(
-        exits=(
-            ZorkGrandInquisitorRegions.ENDGAME,
-            ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST,
-        )
+        exits=(ZorkGrandInquisitorRegions.PORT_FOOZLE_PAST,)
     ),
     ZorkGrandInquisitorRegions.SPELL_LAB: ZorkGrandInquisitorRegionData(
         exits=(ZorkGrandInquisitorRegions.SPELL_LAB_BRIDGE,)
@@ -174,7 +175,10 @@ class ZorkGrandInquisitorRegionData(NamedTuple):
     ZorkGrandInquisitorRegions.WHITE_HOUSE: ZorkGrandInquisitorRegionData(
         exits=(
             ZorkGrandInquisitorRegions.DM_LAIR_INTERIOR,
-            ZorkGrandInquisitorRegions.ENDGAME,
+            ZorkGrandInquisitorRegions.WHITE_HOUSE_INTERIOR,
         )
     ),
+    ZorkGrandInquisitorRegions.WHITE_HOUSE_INTERIOR: ZorkGrandInquisitorRegionData(
+        exits=(ZorkGrandInquisitorRegions.WHITE_HOUSE,)
+    ),
 }