Skip to content
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.

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

Lingo: The Pilgrim Update #2884

Merged
merged 36 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f4746da
Lingo: Fix non-progressive The Colorful
hatkirby Jan 30, 2024
3b15258
Lingo: Add sunwarp shuffling
hatkirby Jan 31, 2024
d8f25ee
sunwarpaccess comment
hatkirby Feb 3, 2024
e6b7218
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Feb 14, 2024
5d1ac78
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Feb 16, 2024
6cc5270
Fix LL1.yaml indentation
hatkirby Feb 17, 2024
1c22364
Add real pilgrimage
hatkirby Feb 27, 2024
2fcf41b
Added pilgrimage goal
hatkirby Feb 27, 2024
57fce04
Fixed some incorrect connections
hatkirby Feb 27, 2024
745052a
Added options for whether roof or paintings are allowed in pilgrimage
hatkirby Feb 27, 2024
1774766
Fixed sunwarp access (+ everything else)
hatkirby Feb 27, 2024
403160d
Add new options to slot data
hatkirby Feb 28, 2024
907095a
That comment was not true
hatkirby Feb 28, 2024
db35486
Added sunwarp shuffling
hatkirby Mar 2, 2024
1074932
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 3, 2024
392c422
Disambiguate entrances with different types
hatkirby Mar 3, 2024
94908d7
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 3, 2024
7897f45
Removed remove_forced_good_item calls from tests
hatkirby Mar 3, 2024
53e94fc
Pilgrim victory uses panel requirements
hatkirby Mar 5, 2024
4959007
Removed unused imports
hatkirby Mar 5, 2024
e89489f
Removed unnecessary sentinel value from Door.panels
hatkirby Mar 14, 2024
751699f
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 15, 2024
187bf81
Fixed stuff with compiled datafile
hatkirby Mar 15, 2024
f111295
Import name set
hatkirby Mar 15, 2024
48ab339
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 15, 2024
5730cb5
Simplified implementation by making it faster
hatkirby Mar 17, 2024
8c745f9
Remove unnecessary import
hatkirby Mar 17, 2024
7265f97
Check for sunwarp items at first segment so we can return early
hatkirby Mar 18, 2024
ead3d21
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 21, 2024
3fd42d2
Minor additional merge fixes
hatkirby Mar 21, 2024
7547544
Eye Wall can actually be progression now
hatkirby Mar 21, 2024
c9324de
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Mar 22, 2024
f061ae5
Review comments
hatkirby Mar 29, 2024
fdd1262
Coalesce connections that differ only by entrance type
hatkirby Mar 29, 2024
90fcf84
Minor simplification
hatkirby Mar 29, 2024
2720aac
Merge remote-tracking branch 'upstream/main' into sunwarp
hatkirby Apr 14, 2024
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
6 changes: 5 additions & 1 deletion worlds/lingo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ def set_rules(self):
def fill_slot_data(self):
slot_options = [
"death_link", "victory_condition", "shuffle_colors", "shuffle_doors", "shuffle_paintings", "shuffle_panels",
"mastery_achievements", "level_2_requirement", "location_checks", "early_color_hallways"
"enable_pilgrimage", "sunwarp_access", "mastery_achievements", "level_2_requirement", "location_checks",
"early_color_hallways", "pilgrimage_allows_roof_access", "pilgrimage_allows_paintings", "shuffle_sunwarps"
]

slot_data = {
Expand All @@ -143,6 +144,9 @@ def fill_slot_data(self):
if self.options.shuffle_paintings:
slot_data["painting_entrance_to_exit"] = self.player_logic.painting_mapping

if self.options.shuffle_sunwarps:
slot_data["sunwarp_permutation"] = self.player_logic.sunwarp_mapping

return slot_data

def get_filler_item_name(self) -> str:
Expand Down
Loading
Loading