Pokemon Red and Blue: Updates to trap weights and tracker support #1395
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 `cerulean_cave_condition` to the `fill_slot_data` function, for a poptracker feature being worked on as it was missing
Adding the ability to disable any kind of trap, for example if you want any status trap except being Poisoned. Will add a contingency to not try and roll a trap if they are all set to disabled.
Added a contingency to creating items such that it doesn't try to create a trap if all the traps are disabled
Alchav
suggested changes
Jan 20, 2023
worlds/pokemon_rb/__init__.py
Outdated
| @@ -190,8 +190,9 @@ def create_items(self) -> None: | |||
| item = self.create_filler() | |||
| else: | |||
| item = self.create_item(location.original_item) | |||
| combinedtraps = self.multiworld.poison_trap_weight[self.player].value + self.multiworld.fire_trap_weight[self.player].value + self.multiworld.paralyze_trap_weight[self.player].value + self.multiworld.ice_trap_weight[self.player].value | |||
There was a problem hiding this comment.
Should be combined_traps to follow PEP 8 variable naming conventions
There was a problem hiding this comment.
Thanks for pointing it out, have renamed
Edited name of variable to follow PEP 8 variable naming conventions
Alchav
approved these changes
Jan 20, 2023
Berserker66
approved these changes
Jan 20, 2023
kindasneaki
pushed a commit
to kindasneaki/Archipelago
that referenced
this pull request
Jun 28, 2023
…chipelagoMW#1395) * Added cerulean_cave_condition to fill_slot_data Added `cerulean_cave_condition` to the `fill_slot_data` function, for a poptracker feature being worked on as it was missing * Added the potential for any traps to be disabled Adding the ability to disable any kind of trap, for example if you want any status trap except being Poisoned. Will add a contingency to not try and roll a trap if they are all set to disabled. * Added contingency to if all traps are disabled Added a contingency to creating items such that it doesn't try to create a trap if all the traps are disabled * Updated variable name Edited name of variable to follow PEP 8 variable naming conventions
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.
What is this fixing or adding?
Added
cerulean_cave_conditionto thefill_slot_datafunction to allow poptracker to auto-update the number requiredMoved
option_disabled = 0to the TrapWeight class to allow any trap in Red and Blue to be disabledAdded a contingency to traps such that if all are disabled, it won't give traps,
How was this tested?
Running
Generate.pyto create a seed with all traps disabled but atrap_percentagegreater than 0. Then posting the seed onto the online branch to check poptracker sees the new tag