Skip to content

(More) minor cleanups #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kumquat-ir wants to merge 2 commits into
base: crosscode-dev
Choose a base branch
from
Open

(More) minor cleanups #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3b7d6b
codegen (goat zira's shop)
kumquat-ir May 14, 2026
f93c4f3
correct di'orbis goal note
kumquat-ir May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions worlds/crosscode/locations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)])),
Expand Down
2 changes: 1 addition & 1 deletion worlds/crosscode/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
20 changes: 10 additions & 10 deletions worlds/crosscode/shops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')])),
}

Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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}),
Expand Down
Loading