HK: Options API updates, et al. #3428
Conversation
… use world = self.multiworld, and remove some things from the logicMixin
github-actions
bot
added
the
waiting-on: peer-review
Exempt-Medic
added
the
is: refactor/cleanup
| @@ -603,15 +640,15 @@ def get_filler_item_name(self) -> str: | |||
| 'RandomizeGeoRocks', 'RandomizeSoulTotems', 'RandomizeLoreTablets', 'RandomizeJunkPitChests', | |||
| 'RandomizeRancidEggs' | |||
| ): | |||
| if getattr(self.multiworld, group): | |||
| if getattr(self.options, group): | |||
There was a problem hiding this comment.
How is the truthiness of the options classes handled? Might need a .value on this
There was a problem hiding this comment.
which ones are you worried about? because options are pretty good at truthy handling,
i can always cast to a bool if you want it to be explicit too
There was a problem hiding this comment.
FYI confirmed that a yaml with all the relevant filler shuffle options turned off and with 9 shop slots for each option
had (except the one Collector's map and Salubra's blessing) only "one_geo" and "soul_refill" filler items
strange unrelated note: i had to filter down to items with .code not None because for some reason lifeblood cocoons were being created as events and i'm not sure why
| @@ -684,42 +721,7 @@ def _hk_notches(self, player: int, *notches: int) -> int: | |||
| return sum(self.multiworld.worlds[player].charm_costs[notch] for notch in notches) | |||
|
|
|||
| def _hk_option(self, player: int, option_name: str) -> int: | |||
| return getattr(self.multiworld, option_name)[player].value | |||
| return getattr(self.multiworld.worlds[player].options, option_name).value | |||
There was a problem hiding this comment.
Curious what the blocker is for the remaining ones to be removed?
There was a problem hiding this comment.
the ones i moved are only used in setting completion condition, I just didn't want to go through the effort to confirm the other ones can be properly moved out of logicmixin (yet)
|
did run a small multi with two HK worlds (and two others) on 24242 and saw no issues |
There was a problem hiding this comment.
Small things, everything else looks good. A couple things like self.player_name could fit in alongside the deprecation fixes, but it's out of scope for this PR. The game generates just fine and the option getter warnings are removed, though it would be nice if _hk_notches could be updated as well
Exempt-Medic
added
waiting-on: world-maintainer
BadMagic100
added
waiting-on: core-review
* updates HK to consistently use world.random, use world.options, don't use world = self.multiworld, and remove some things from the logicMixin * Update HK to new options dataclass * Move completion condition helpers to Rules.py * updates from review
What is this fixing or adding?
updates HK to:
How was this tested?
couple generations on base settings
generated template yaml and compared to previous one
If this makes graphical changes, please attach screenshots.