Updates to support new flags/settings in Archipelago #164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
January 26, 2025 14:41
This will require a change to the apworld to actually be able to set the option to this value, but we need to be able to do something with it first.
sgrunt
commented
Jan 27, 2025
| // Pyramid start checks | ||
| {1337233, new ItemKey(15, 2, 200, 562)}, //training dummy | ||
| {1337234, new ItemKey(14, 0, 240, 192)}, //gyre | ||
| {1337235, new ItemKey(16, 2, 2192, 1552)}, //pyramid rubble |
There was a problem hiding this comment.
Values here are from ItemLocationMap.
sgrunt
commented
Jan 27, 2025
| @@ -344,6 +347,7 @@ public static SettingCollection LoadSettingsFromSlotData(Dictionary<string, obje | |||
| settings.ChaosTrap.Value = traps.Contains("Chaos Trap"); | |||
| settings.NeurotoxinTrap.Value = traps.Contains("Neurotoxin Trap"); | |||
| settings.BeeTrap.Value = traps.Contains("Bee Trap"); | |||
| settings.ThrowStunTrap.Value = traps.Contains("Throw Stun Trap"); | |||
There was a problem hiding this comment.
The apworld already has support for this trap, but it doesn't do anything because of the absence of this line.
sgrunt
commented
Jan 27, 2025
| @@ -190,6 +190,9 @@ public static SettingCollection LoadSettingsFromSlotData(Dictionary<string, obje | |||
| case 3: | |||
| enumValue = "Ryshia"; | |||
| break; | |||
| case 4: | |||
There was a problem hiding this comment.
The apworld PR for this (ArchipelagoMW/Archipelago#4559) uses 4 for this value.
sgrunt
force-pushed
the
ap-new-settings
branch
from
84aeb05 to
8fdb8fd
Compare
…)" location for Lock Key Amadeus
sgrunt
force-pushed
the
ap-new-settings
branch
from
8fdb8fd to
f26b4e6
Compare
sgrunt
commented
Jan 27, 2025
| @@ -548,7 +548,7 @@ void AddDownloadTerminals() | |||
| areaName = "The lab"; | |||
| Add(new ItemKey(11, 6, 200, 192), "Lab: Download and chest room terminal (Experiment #13)", null, UpperLab & R.Tablet); | |||
| Add(new ItemKey(11, 15, 152, 176), "Lab: Middle terminal (Amadeus Laboratory Map)", null, LabResearchWing & R.Tablet); | |||
| Add(new ItemKey(11, 16, 600, 192), "Lab: Sentry platform terminal (Origins)", null, LabResearchWing & R.Tablet); | |||
| Add(new ItemKey(11, 16, 600, 192), "Lab: Sentry platform terminal (Origins)", null, (SeedOptions.LockKeyAmadeus ? MainLab & R.LabGenza : LabResearchWing) & R.Tablet); | |||
There was a problem hiding this comment.
I noticed this omission while inspecting my own upstream logic in the apworld - ArchipelagoMW/Archipelago#4559 (comment)
The room this terminal is in is gated behind the Genza laser, so in Lock Key Amadeus it should be accessed as such.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are a few new settings or flags that don't have 100% of everything they need to be supported in Archipelago, as I discovered while working on a companion pull request to this to update the apworld to include all of the recently added settings and flags. This is seemingly everything necessary to get them all working based on some local testing.