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

Make Yhorm's default location non-optional #30

Merged
merged 1 commit into from
Jul 27, 2024
Merged
Changes from all commits
Commits
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: 1 addition & 5 deletions worlds/dark_souls_3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class DarkSouls3World(World):
location_descriptions = location_descriptions
item_descriptions = item_descriptions

yhorm_location: Optional[DS3BossInfo]
yhorm_location: DS3BossInfo = default_yhorm_location
"""If enemy randomization is enabled, this is the boss who Yhorm the Giant should replace.

This is used to determine where the Storm Ruler can be placed.
Expand Down Expand Up @@ -102,8 +102,6 @@ def generate_early(self):
for boss in all_bosses:
if yhorm_data.startswith(boss.name):
self.yhorm_location = boss
else:
self.yhorm_location = default_yhorm_location

# Randomize Yhorm manually so that we know where to place the Storm Ruler.
elif self.options.randomize_enemies:
Expand All @@ -119,8 +117,6 @@ def generate_early(self):
)
):
self.multiworld.local_early_items[self.player]["Storm Ruler"] = 1
else:
self.yhorm_location = default_yhorm_location

def _allow_boss_for_yhorm(self, boss: DS3BossInfo) -> bool:
"""Returns whether boss is a valid location for Yhorm in this seed."""
Expand Down
Loading