morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Minor Options cleanup (#1182)

Browse Source 
* Options.py cleanup

* TextChoice cleanup

* make Option.current_option_name a property

* title the TextChoce option names

* satisfy the linter

* a little more options cleanup

* move the typing import

* typing should be PlandoSettings

* fix incorrect conflict merging

* make imports local

* the tests seem to want me to import these twice though i hate it.

* changes from review. Make the various Location verifying Options `LocationSet`

* remove unnecessary fluff

* begrudgingly support get_current_option_name. Leave a comment that worlds shouldn't be touching this

* log a deprecation warning and return the property for `get_current_option_name()`

---------

Co-authored-by: beauxq <beauxq@yahoo.com>
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
This commit is contained in:
alwaysintreble
2023-03-07 01:44:20 -06:00
committed by GitHub
parent e6109394ad
commit 414166f6a2
4 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/zillion/__init__.py
View File

@@ -255,7 +255,7 @@ class ZillionWorld(World):
group_players = group["players"]
start_chars = cast(Dict[int, ZillionStartChar], getattr(multiworld, "start_char"))
players_start_chars = [
(player, start_chars[player].get_current_option_name())
(player, start_chars[player].current_option_name)
for player in group_players
]
start_char_counts = Counter(sc for _, sc in players_start_chars)