mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Core: move option results to the World class instead of MultiWorld (#993)
🤞 * map option objects to a `World.options` dict * convert RoR2 to options dict system for testing * add temp behavior for lttp with notes * copy/paste bad * convert `set_default_common_options` to a namespace property * reorganize test call order * have fill_restrictive use the new options system * update world api * update soe tests * fix world api * core: auto initialize a dataclass on the World class with the option results * core: auto initialize a dataclass on the World class with the option results: small tying improvement * add `as_dict` method to the options dataclass * fix namespace issues with tests * have current option updates use `.value` instead of changing the option * update ror2 to use the new options system again * revert the junk pool dict since it's cased differently * fix begin_with_loop typo * write new and old options to spoiler * change factorio option behavior back * fix comparisons * move common and per_game_common options to new system * core: automatically create missing options_dataclass from legacy option_definitions * remove spoiler special casing and add back the Factorio option changing but in new system * give ArchipIDLE the default options_dataclass so its options get generated and spoilered properly * reimplement `inspect.get_annotations` * move option info generation for webhost to new system * need to include Common and PerGame common since __annotations__ doesn't include super * use get_type_hints for the options dictionary * typing.get_type_hints returns the bases too. * forgot to sweep through generate * sweep through all the tests * swap to a metaclass property * move remaining usages from get_type_hints to metaclass property * move remaining usages from __annotations__ to metaclass property * move remaining usages from legacy dictionaries to metaclass property * remove legacy dictionaries * cache the metaclass property * clarify inheritance in world api * move the messenger to new options system * add an assert for my dumb * update the doc * rename o to options * missed a spot * update new messenger options * comment spacing Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> * fix tests * fix missing import * make the documentation definition more accurate * use options system for loc creation * type cast MessengerWorld * fix typo and use quotes for cast * LTTP: set random seed in tests * ArchipIdle: remove change here as it's default on AutoWorld * Stardew: Need to set state because `set_default_common_options` used to * The Messenger: update shop rando and helpers to new system; optimize imports * Add a kwarg to `as_dict` to do the casing for you * RoR2: use new kwarg for less code * RoR2: revert some accidental reverts * The Messenger: remove an unnecessary variable * remove TypeVar that isn't used * CommonOptions not abstract * Docs: fix mistake in options api.md Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> * create options for item link worlds * revert accidental doc removals * Item Links: set default options on group * change Zillion to new options dataclass * remove unused parameter to function * use TypeGuard for Literal narrowing * move dlc quest to new api * move overcooked 2 to new api * fixed some missed code in oc2 * - Tried to be compliant with 993 (WIP?) * - I think it all works now * - Removed last trace of me touching core * typo * It now passes all tests! * Improve options, fix all issues I hope * - Fixed init options * dlcquest: fix bad imports * missed a file * - Reduce code duplication * add as_dict documentation * - Use .items(), get option name more directly, fix slot data content * - Remove generic options from the slot data * improve slot data documentation * remove `CommonOptions.get_value` (#21) * better slot data description Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --------- Co-authored-by: el-u <109771707+el-u@users.noreply.github.com> Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com> Co-authored-by: Doug Hoskisson <beauxq@yahoo.com> Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> Co-authored-by: Alex Gilbert <alexgilbert@yahoo.com>
This commit is contained in:
@@ -1,22 +1,6 @@
|
||||
from typing import Union, Dict, runtime_checkable, Protocol
|
||||
from Options import Option, DeathLink, Choice, Toggle, SpecialRange
|
||||
from dataclasses import dataclass
|
||||
|
||||
|
||||
@runtime_checkable
|
||||
class DLCQuestOption(Protocol):
|
||||
internal_name: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class DLCQuestOptions:
|
||||
options: Dict[str, Union[bool, int]]
|
||||
|
||||
def __getitem__(self, item: Union[str, DLCQuestOption]) -> Union[bool, int]:
|
||||
if isinstance(item, DLCQuestOption):
|
||||
item = item.internal_name
|
||||
|
||||
return self.options.get(item, None)
|
||||
from Options import Choice, DeathLink, PerGameCommonOptions, SpecialRange
|
||||
|
||||
|
||||
class DoubleJumpGlitch(Choice):
|
||||
@@ -94,31 +78,13 @@ class ItemShuffle(Choice):
|
||||
default = 0
|
||||
|
||||
|
||||
DLCQuest_options: Dict[str, type(Option)] = {
|
||||
option.internal_name: option
|
||||
for option in [
|
||||
DoubleJumpGlitch,
|
||||
CoinSanity,
|
||||
CoinSanityRange,
|
||||
TimeIsMoney,
|
||||
EndingChoice,
|
||||
Campaign,
|
||||
ItemShuffle,
|
||||
]
|
||||
}
|
||||
default_options = {option.internal_name: option.default for option in DLCQuest_options.values()}
|
||||
DLCQuest_options["death_link"] = DeathLink
|
||||
|
||||
|
||||
def fetch_options(world, player: int) -> DLCQuestOptions:
|
||||
return DLCQuestOptions({option: get_option_value(world, player, option) for option in DLCQuest_options})
|
||||
|
||||
|
||||
def get_option_value(world, player: int, name: str) -> Union[bool, int]:
|
||||
assert name in DLCQuest_options, f"{name} is not a valid option for DLC Quest."
|
||||
|
||||
value = getattr(world, name)
|
||||
|
||||
if issubclass(DLCQuest_options[name], Toggle):
|
||||
return bool(value[player].value)
|
||||
return value[player].value
|
||||
@dataclass
|
||||
class DLCQuestOptions(PerGameCommonOptions):
|
||||
double_jump_glitch: DoubleJumpGlitch
|
||||
coinsanity: CoinSanity
|
||||
coinbundlequantity: CoinSanityRange
|
||||
time_is_money: TimeIsMoney
|
||||
ending_choice: EndingChoice
|
||||
campaign: Campaign
|
||||
item_shuffle: ItemShuffle
|
||||
death_link: DeathLink
|
||||
|
Reference in New Issue
Block a user