diff --git a/worlds/crosscode/locations.py b/worlds/crosscode/locations.py index bd182bbe6fab..1ee02fa05151 100644 --- a/worlds/crosscode/locations.py +++ b/worlds/crosscode/locations.py @@ -914,14 +914,14 @@ LocationData(code=3235824905, name='Global Shop Slot: Cross Mail', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name='Beach Weapons'), ShopSlotCondition(shop_name='beachWeapons', item_id=569)]), AndCondition(subconditions=[RegionCondition(target_mode=None, region_name='Rhombus Weapons + DLC'), ShopSlotCondition(shop_name='rhombusWeapons1', item_id=569)])])])), LocationData(code=3235824906, name='Shop Slot: Cross Boots (Beach Weapons)', area='beach', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Beach Weapons'}, cond=[ShopSlotCondition(shop_name='beachWeapons', item_id=570)])), LocationData(code=3235824907, name='Global Shop Slot: Cross Boots', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name='Beach Weapons'), ShopSlotCondition(shop_name='beachWeapons', item_id=570)]), AndCondition(subconditions=[RegionCondition(target_mode=None, region_name='Rhombus Weapons + DLC'), ShopSlotCondition(shop_name='rhombusWeapons1', item_id=570)])])])), - LocationData(code=3235824908, name="Shop Slot: Sandwich (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=1)])), - LocationData(code=3235824909, name="Shop Slot: Hi-Sandwich (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=27)])), - LocationData(code=3235824910, name="Shop Slot: Green Leaf Tea (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=2)])), - LocationData(code=3235824911, name="Shop Slot: Just Water (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=366)])), - LocationData(code=3235824912, name="Shop Slot: Goat Cheese (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=670)])), - LocationData(code=3235824913, name='Global Shop Slot: Goat Cheese', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name="Goat Zira's Shop"), ShopSlotCondition(shop_name='goatShop', item_id=670)])])])), - LocationData(code=3235824914, name="Shop Slot: Goat Milk (Goat Zira's Shop)", area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=671)])), - LocationData(code=3235824915, name='Global Shop Slot: Goat Milk', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name="Goat Zira's Shop"), ShopSlotCondition(shop_name='goatShop', item_id=671)])])])), + LocationData(code=3235824908, name="Shop Slot: Sandwich (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=1)])), + LocationData(code=3235824909, name="Shop Slot: Hi-Sandwich (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=27)])), + LocationData(code=3235824910, name="Shop Slot: Green Leaf Tea (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=2)])), + LocationData(code=3235824911, name="Shop Slot: Just Water (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=366)])), + LocationData(code=3235824912, name="Shop Slot: Goat Cheese (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=670)])), + LocationData(code=3235824913, name='Global Shop Slot: Goat Cheese', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name="Goat Zira's Shop"), ShopSlotCondition(shop_name='goatShop', item_id=670)])])])), + LocationData(code=3235824914, name="Shop Slot: Goat Milk (Goat Zira's Shop)", area='rhombus-sqr', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': "Goat Zira's Shop"}, cond=[ShopSlotCondition(shop_name='goatShop', item_id=671)])), + LocationData(code=3235824915, name='Global Shop Slot: Goat Milk', metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'Menu'}, cond=[OrCondition(subconditions=[AndCondition(subconditions=[RegionCondition(target_mode=None, region_name="Goat Zira's Shop"), ShopSlotCondition(shop_name='goatShop', item_id=671)])])])), LocationData(code=3235824916, name='Shop Slot: Cross Goggles (Rhombus Weapons + DLC)', area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'linear': 'Rhombus Weapons + DLC', 'open': 'Rhombus Weapons + DLC'}, cond=[ShopSlotCondition(shop_name='rhombusWeapons1', item_id=568)])), LocationData(code=3235824917, name='Shop Slot: Cross Edge (Rhombus Weapons + DLC)', area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'linear': 'Rhombus Weapons + DLC', 'open': 'Rhombus Weapons + DLC'}, cond=[ShopSlotCondition(shop_name='rhombusWeapons1', item_id=567)])), LocationData(code=3235824918, name='Shop Slot: Cross Mail (Rhombus Weapons + DLC)', area='rhombus-sqr', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'linear': 'Rhombus Weapons + DLC', 'open': 'Rhombus Weapons + DLC'}, cond=[ShopSlotCondition(shop_name='rhombusWeapons1', item_id=569)])), diff --git a/worlds/crosscode/options.py b/worlds/crosscode/options.py index 4110da1433e4..143b5d0a0648 100644 --- a/worlds/crosscode/options.py +++ b/worlds/crosscode/options.py @@ -26,7 +26,7 @@ class Goal(Choice): [Creator] Ascend Vermillion Tower and fight the Creator. [Monkey] Ascend the Grand Krys'kajo and defeat the Son of the East. [Observatory] Complete all five A Promise is a Promise quests and uncover the secret of the Observatory. - [Di'orbis] Descend Ku'lero temple and defeat the Gods of Shape. Will force DLC to be enabled. + [Di'orbis] Descend Ku'lero temple and defeat the Gods of Shape. Requires DLC to be enabled. """ display_name = "Goal" diff --git a/worlds/crosscode/shops.py b/worlds/crosscode/shops.py index 1f63913359c3..a3e9c03ba4b7 100644 --- a/worlds/crosscode/shops.py +++ b/worlds/crosscode/shops.py @@ -45,7 +45,7 @@ 'Homestedt Items': ShopData(internal_name='homestedtItems', name='Homestedt Items', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'openDLC1'})), 'Homestedt Weapons': ShopData(internal_name='homestedtWeapons', name='Homestedt Weapons', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'openDLC1'})), 'Beach Weapons': ShopData(internal_name='beachWeapons', name='Beach Weapons', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'openDLC_Beach'})), - "Goat Zira's Shop": ShopData(internal_name='goatShop', name="Goat Zira's Shop", metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'open20'}, cond=[QuestCondition(quest_name='Wrath of Goat'), VariableCondition(name='canGrind')])), + "Goat Zira's Shop": ShopData(internal_name='goatShop', name="Goat Zira's Shop", metadata={'quest': True, 'dlc': True, 'shop': True}, access=AccessInfo(region={'open': 'open20'}, cond=[QuestCondition(quest_name='Wrath of Goat'), VariableCondition(name='canGrind')])), 'Rhombus Weapons + DLC': ShopData(internal_name='rhombusWeapons1', name='Rhombus Weapons + DLC', metadata={'dlc': True, 'shop': True}, access=AccessInfo(region={'linear': '33', 'open': 'open20'}, cond=[VariableCondition(name='canGrind')])), } @@ -497,8 +497,8 @@ 567: ItemPoolEntry(item=items_dict['Global Slot Unlock: Cross Edge', 1], quantity=1, metadata={'dlc': True, 'shop': True}), 569: ItemPoolEntry(item=items_dict['Global Slot Unlock: Cross Mail', 1], quantity=1, metadata={'dlc': True, 'shop': True}), 570: ItemPoolEntry(item=items_dict['Global Slot Unlock: Cross Boots', 1], quantity=1, metadata={'dlc': True, 'shop': True}), - 670: ItemPoolEntry(item=items_dict['Global Slot Unlock: Goat Cheese', 1], quantity=1, metadata={'dlc': True, 'shop': True}), - 671: ItemPoolEntry(item=items_dict['Global Slot Unlock: Goat Milk', 1], quantity=1, metadata={'dlc': True, 'shop': True}), + 670: ItemPoolEntry(item=items_dict['Global Slot Unlock: Goat Cheese', 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + 671: ItemPoolEntry(item=items_dict['Global Slot Unlock: Goat Milk', 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), } shop_unlock_by_shop = { @@ -527,7 +527,7 @@ 'homestedtItems': ItemPoolEntry(item=items_dict['Shop Unlock: Homestedt Items', 1], quantity=1, metadata={'dlc': True, 'shop': True}), 'homestedtWeapons': ItemPoolEntry(item=items_dict['Shop Unlock: Homestedt Weapons', 1], quantity=1, metadata={'dlc': True, 'shop': True}), 'beachWeapons': ItemPoolEntry(item=items_dict['Shop Unlock: Beach Weapons', 1], quantity=1, metadata={'dlc': True, 'shop': True}), - 'goatShop': ItemPoolEntry(item=items_dict["Shop Unlock: Goat Zira's Shop", 1], quantity=1, metadata={'dlc': True, 'shop': True}), + 'goatShop': ItemPoolEntry(item=items_dict["Shop Unlock: Goat Zira's Shop", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), } shop_unlock_by_shop_and_id = { @@ -761,12 +761,12 @@ ('beachWeapons', 567): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Edge (Beach Weapons)', 1], quantity=1, metadata={'dlc': True, 'shop': True}), ('beachWeapons', 569): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Mail (Beach Weapons)', 1], quantity=1, metadata={'dlc': True, 'shop': True}), ('beachWeapons', 570): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Boots (Beach Weapons)', 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 1): ItemPoolEntry(item=items_dict["Slot Unlock: Sandwich (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 27): ItemPoolEntry(item=items_dict["Slot Unlock: Hi-Sandwich (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 2): ItemPoolEntry(item=items_dict["Slot Unlock: Green Leaf Tea (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 366): ItemPoolEntry(item=items_dict["Slot Unlock: Just Water (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 670): ItemPoolEntry(item=items_dict["Slot Unlock: Goat Cheese (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), - ('goatShop', 671): ItemPoolEntry(item=items_dict["Slot Unlock: Goat Milk (Goat Zira's Shop)", 1], quantity=1, metadata={'dlc': True, 'shop': True}), + ('goatShop', 1): ItemPoolEntry(item=items_dict["Slot Unlock: Sandwich (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + ('goatShop', 27): ItemPoolEntry(item=items_dict["Slot Unlock: Hi-Sandwich (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + ('goatShop', 2): ItemPoolEntry(item=items_dict["Slot Unlock: Green Leaf Tea (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + ('goatShop', 366): ItemPoolEntry(item=items_dict["Slot Unlock: Just Water (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + ('goatShop', 670): ItemPoolEntry(item=items_dict["Slot Unlock: Goat Cheese (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), + ('goatShop', 671): ItemPoolEntry(item=items_dict["Slot Unlock: Goat Milk (Goat Zira's Shop)", 1], quantity=1, metadata={'quest': True, 'dlc': True, 'shop': True}), ('rhombusWeapons1', 568): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Goggles (Rhombus Weapons + DLC)', 1], quantity=1, metadata={'dlc': True, 'shop': True}), ('rhombusWeapons1', 567): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Edge (Rhombus Weapons + DLC)', 1], quantity=1, metadata={'dlc': True, 'shop': True}), ('rhombusWeapons1', 569): ItemPoolEntry(item=items_dict['Slot Unlock: Cross Mail (Rhombus Weapons + DLC)', 1], quantity=1, metadata={'dlc': True, 'shop': True}),