Skip to content

DS3: Added 'Early Banner' Setting #2199

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

Merged
merged 31 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
200a78a
make setting for early lothric banner
Br00ty Sep 17, 2023
746490c
changed setting to call `early_items` instead of `local_early_items`
Br00ty Sep 19, 2023
3a07006
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 20, 2023
5e558a9
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 20, 2023
a062c25
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 21, 2023
df1c2ae
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 23, 2023
af5abd5
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 24, 2023
db6f87e
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 27, 2023
7ac393d
Merge branch 'main' into ds3-early-banner
Br00ty Sep 28, 2023
f2a9f30
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Sep 30, 2023
0b3d5d9
Merge branch 'main' into ds3-early-banner
Br00ty Oct 2, 2023
a578e55
Merge branch 'ArchipelagoMW:main' into ds3-early-banner
Br00ty Oct 3, 2023
69fab6a
Merge branch 'main' into ds3-early-banner
Br00ty Oct 5, 2023
fb63c6c
Merge branch 'main' into ds3-early-banner
Br00ty Oct 16, 2023
4b53659
Merge branch 'main' into ds3-early-banner
Br00ty Oct 17, 2023
843194c
Merge branch 'main' into ds3-early-banner
Br00ty Oct 23, 2023
5df7560
Merge branch 'main' into ds3-early-banner
Br00ty Oct 29, 2023
fb02922
Merge branch 'main' into ds3-early-banner
Br00ty Oct 29, 2023
cc3c83e
Merge branch 'main' into ds3-early-banner
Br00ty Oct 30, 2023
d37b454
Merge branch 'main' into ds3-early-banner
Br00ty Nov 3, 2023
bd2ac60
Merge branch 'main' into ds3-early-banner
Br00ty Nov 4, 2023
e3812a1
changed it so the user can decide on where the early banner should be…
Br00ty Nov 4, 2023
580b6de
move the settings to be under `key locations`
Br00ty Nov 5, 2023
a1c3bbb
Merge branch 'main' into ds3-early-banner
Br00ty Nov 8, 2023
b4db4e0
Merge branch 'main' into ds3-early-banner
Br00ty Nov 11, 2023
7ee4028
Update Options.py
Br00ty Nov 16, 2023
1cb1dc1
Update __init__.py
Br00ty Nov 16, 2023
a29c8bf
Merge branch 'main' into ds3-early-banner
Br00ty Nov 16, 2023
0930f06
Merge branch 'main' into ds3-early-banner
Br00ty Nov 21, 2023
ab405d9
Update worlds/dark_souls_3/__init__.py
Br00ty Nov 25, 2023
ef26524
Merge branch 'main' into ds3-early-banner
Br00ty Nov 25, 2023
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
7 changes: 7 additions & 0 deletions worlds/dark_souls_3/Options.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ class MaxLevelsIn10WeaponPoolOption(Range):
default = 10



class EarlySmallLothricBanner(Toggle):
"""This option makes it so the Small Lothric Banner is forced to be in an early sphere."""
display_name = "Early Small Lothric Banner"


class LateBasinOfVowsOption(Toggle):
"""This option makes it so the Basin of Vows is still randomized, but guarantees you that you wont have to venture into
Lothric Castle to find your Small Lothric Banner to get out of High Wall of Lothric. So you may find Basin of Vows early,
Expand Down Expand Up @@ -215,6 +221,7 @@ class EnableDLCOption(Toggle):
"max_levels_in_5": MaxLevelsIn5WeaponPoolOption,
"min_levels_in_10": MinLevelsIn10WeaponPoolOption,
"max_levels_in_10": MaxLevelsIn10WeaponPoolOption,
"early_banner": EarlySmallLothricBanner,
"late_basin_of_vows": LateBasinOfVowsOption,
"late_dlc": LateDLCOption,
"no_spell_requirements": NoSpellRequirementsOption,
Expand Down
2 changes: 2 additions & 0 deletions worlds/dark_souls_3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ def generate_early(self):
self.enabled_location_categories.add(DS3LocationCategory.HEALTH)
if self.multiworld.enable_progressive_locations[self.player] == Toggle.option_true:
self.enabled_location_categories.add(DS3LocationCategory.PROGRESSIVE_ITEM)
if self.multiworld.early_banner[self.player] == Toggle.option_true:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be conditional on MISC locations being randomized?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm not dealing with anything other than the Banner for this PR. this PR's intentions were not to go any deeper than to solve one singular issue, and that is having a Sphere 1 banner across worlds.

I'd say if thats something that you would like to see when you start implementing your take on the client, that would be the time to create a seperate PR along with your changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean for the banner specifically—since the banner location is only randomized at all if enable_misc_locations is set, you'll be requesting early assignment for an item that's not in the item pool at all when it's not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got what you mean now, corrected it to be under KEY locations, as that is where the banner resides, is under KEYS not MISC

self.multiworld.early_items[self.player]['Small Lothric Banner'] = 1


def create_regions(self):
Expand Down