Skip to content

alttp: Add fill_slot_data function #1919

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

Merged
merged 7 commits into from
Jul 30, 2023
Merged

alttp: Add fill_slot_data function #1919

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a8ffc6
__init__.py: Add fill_slot_data function
StripesOO7 Jun 30, 2023
48c2012
LTTP__init__.py added race condition to fill_slot_data
StripesOO7 Jul 1, 2023
bc82747
added missing self to multiworl.is_race
StripesOO7 Jul 1, 2023
ebb5a12
changed filling of slot_data to fill from static list instead of pull…
StripesOO7 Jul 29, 2023
dff5eef
changed filling of slot_data to fill from static list instead of pull…
StripesOO7 Jul 29, 2023
c563a5b
Merge remote-tracking branch 'origin/LTTP-add-fill_slot_data-function…
StripesOO7 Jul 29, 2023
8adbb93
added a comment to describe the use for the option added to slot_data
StripesOO7 Jul 30, 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
17 changes: 17 additions & 0 deletions worlds/alttp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,23 @@ def get_pre_fill_items(self):
res.append(item)
return res

def fill_slot_data(self):
slot_data = {}
if not self.multiworld.is_race:
for option_name in alttp_options:
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't like that this is pulling every option in the options system. I know that isn't currently a lot for LTTP, but there's still some there that I doubt you need, like palette shuffle, and this will only get worse as the options get moved over.

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 don't like that this is pulling every option in the options system. I know that isn't currently a lot for LTTP, but there's still some there that I doubt you need, like palette shuffle, and this will only get worse as the options get moved over.

which version would you prefere then?
having a static list, iterating over it and adding it to slot_data?
OR simply having ~20 static, basically identical, lines for each option i need/want for the tracker?

Copy link
Collaborator

Choose a reason for hiding this comment

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

having a static list, iterating over it and adding it to slot_data?

This exactly. you make it sound like a bad thing? fwiw #993 makes this significantly easier, but we don't have that yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh. no. I have nothing against that solution and never had.

I will change that when i'm back home.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is that what you intended it look like?

option = getattr(self.multiworld, option_name)[self.player]
slot_data[option_name] = option.value

slot_data.update({
'mode': self.multiworld.mode[self.player],
'goal': self.multiworld.goal[self.player],
'dark_room_logic': self.multiworld.dark_room_logic[self.player],
'mm_medalion': self.multiworld.required_medallions[self.player][0],
'tr_medalion': self.multiworld.required_medallions[self.player][1],
'shop_shuffle': self.multiworld.shop_shuffle[self.player]}
)
return slot_data


def get_same_seed(world, seed_def: tuple) -> str:
seeds: typing.Dict[tuple, str] = getattr(world, "__named_seeds", {})
Expand Down