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

OOT: Adds Options to slot_data for poptracker-pack #3570

Merged
merged 2 commits into from
Jun 22, 2024

Conversation

StripesOO7
Copy link
Contributor

What is this fixing or adding?

Adds all options to fill_slot_data that are worth tracking in a poptracker pack.
This is aimed at providing information for the oot poptracker-pack for autofilling of settings within this pack.

How was this tested?

Generated a few Solo OOT Seeds and connected to the Slot via poptracker and printed the received slotdata to the console

…in the poptracker pack. This is aimed at providing information for the oot poptracker-pack for autofilling of settings within this pack.
@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Jun 19, 2024
@Exempt-Medic Exempt-Medic added waiting-on: world-maintainer Issue/PR is waiting for feedback or approval by the maintainer of a world. is: enhancement Issues requesting new features or pull requests implementing new features. labels Jun 19, 2024
@StripesOO7 StripesOO7 changed the title OOT; Adds Options to slot_data for poptracker-pack OOT: Adds Options to slot_data for poptracker-pack Jun 19, 2024
@NewSoupVi NewSoupVi requested a review from espeon65536 June 20, 2024 02:30
@NewSoupVi
Copy link
Member

@NewSoupVi NewSoupVi removed the waiting-on: world-maintainer Issue/PR is waiting for feedback or approval by the maintainer of a world. label Jun 20, 2024
'collectible_override_flags': self.collectible_override_flags,
'collectible_flag_offsets': self.collectible_flag_offsets
}
slot_data.update(self.options.as_dict("open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress",
Copy link
Member

@Exempt-Medic Exempt-Medic Jun 21, 2024

Choose a reason for hiding this comment

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

A lot of these lines are really long, much longer than 120 characters, the linebreaks also seem to be pretty much random. I think you should make the lines indented to this level and then also organize them more

Suggested change
slot_data.update(self.options.as_dict("open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress",
slot_data.update(self.options.as_dict(
"open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress",

For example:

        slot_data.update(self.options.as_dict(
            "open_forest", "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress", "bridge",
            "trials", "starting_age", "shuffle_interior_entrances", "shuffle_grotto_entrances",
            "shuffle_dungeon_entrances", "shuffle_overworld_entrances", "owl_drops", "warp_songs", "spawn_positions",
            "shuffle_bosses", "triforce_hunt", "triforce_goal", "extra_triforce_percentage", "bombchus_in_logic",
            "dungeon_shortcuts", "dungeon_shortcuts_list", "mq_dungeons_mode", "mq_dungeons_list", "mq_dungeons_count",
            "bridge_stones", "bridge_medallions", "bridge_rewards", "bridge_tokens", "bridge_hearts",
            "shuffle_song_items", "shopsanity", "shop_slots", "shopsanity_prices", "tokensanity", "shuffle_scrubs",
            "shuffle_child_trade", "shuffle_freestanding_items", "shuffle_pots", "shuffle_crates", "shuffle_cows",
            "shuffle_beehives", "shuffle_kokiri_sword", "shuffle_ocarinas", "shuffle_gerudo_card", "shuffle_beans",
            "shuffle_medigoron_carpet_salesman", "shuffle_frog_song_rupees", "shuffle_mapcompass", "shuffle_smallkeys",
            "shuffle_hideoutkeys", "shuffle_bosskeys", "enhance_map_compass", "shuffle_ganon_bosskey",
            "ganon_bosskey_medallions", "ganon_bosskey_stones", "ganon_bosskey_rewards", "ganon_bosskey_tokens",
            "ganon_bosskey_hearts", "key_rings", "key_rings_list", "no_epona_race", "skip_some_minigame_phases",
            "complete_mask_quest", "free_scarecrow", "plant_beans", "chicken_count", "big_poe_count",
            "fae_torch_count", "damage_multiplier", "deadly_bonks", "starting_tod", "blue_fire_arrows",
            "start_with_consumables", "junk_ice_traps", "adult_trade_start", "logic_rules",
            "logic_no_night_tokens_without_suns_song", "logic_tricks", "plando_connections"
            ))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They where sort-of organized. Once for a somewhat thematic grouping...so some of the lines were intentionally shorter/longer.
And i had it in my PyCharm install.
But haven't looked at how long these lines were. So I'll try and make it more uniform.

Copy link
Member

@Exempt-Medic Exempt-Medic left a comment

Choose a reason for hiding this comment

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

Generates just fine and slot_data gets properly filled

@NewSoupVi NewSoupVi merged commit d00abe7 into ArchipelagoMW:main Jun 22, 2024
17 checks passed
@StripesOO7 StripesOO7 deleted the OOT-Tracker-slotdata branch June 22, 2024 11:51
qwint pushed a commit to qwint/Archipelago that referenced this pull request Jun 24, 2024
* Add imo all needed options to fill_slot_data that are worth tracking in the poptracker pack. This is aimed at providing information for the oot poptracker-pack for autofilling of settings within this pack.

* cap line length at 120 and reorganize list

---------

Co-authored-by: StripesOO7 <[email protected]>
GameWyrm pushed a commit to GameWyrm/Archipelago-GW that referenced this pull request Jul 4, 2024
* Add imo all needed options to fill_slot_data that are worth tracking in the poptracker pack. This is aimed at providing information for the oot poptracker-pack for autofilling of settings within this pack.

* cap line length at 120 and reorganize list

---------

Co-authored-by: StripesOO7 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: enhancement Issues requesting new features or pull requests implementing new features. waiting-on: peer-review Issue/PR has not been reviewed by enough people yet.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants