 7193182294
			
		
	
	7193182294
	
	
	
		
			
			🤞 * 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>
		
			
				
	
	
		
			94 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from functools import cached_property
 | |
| from typing import Optional, TYPE_CHECKING, cast
 | |
| 
 | |
| from BaseClasses import CollectionState, Item, ItemClassification, Location, Region
 | |
| from .constants import NOTES, PHOBEKINS, PROG_ITEMS, USEFUL_ITEMS
 | |
| from .options import Goal
 | |
| from .regions import MEGA_SHARDS, REGIONS, SEALS
 | |
| from .shop import FIGURINES, PROG_SHOP_ITEMS, SHOP_ITEMS, USEFUL_SHOP_ITEMS
 | |
| 
 | |
| if TYPE_CHECKING:
 | |
|     from . import MessengerWorld
 | |
| 
 | |
| 
 | |
| class MessengerRegion(Region):
 | |
|     
 | |
|     def __init__(self, name: str, world: "MessengerWorld") -> None:
 | |
|         super().__init__(name, world.player, world.multiworld)
 | |
|         locations = [loc for loc in REGIONS[self.name]]
 | |
|         if self.name == "The Shop":
 | |
|             if world.options.goal > Goal.option_open_music_box:
 | |
|                 locations.append("Shop Chest")
 | |
|             shop_locations = {f"The Shop - {shop_loc}": world.location_name_to_id[f"The Shop - {shop_loc}"]
 | |
|                               for shop_loc in SHOP_ITEMS}
 | |
|             shop_locations.update(**{figurine: world.location_name_to_id[figurine] for figurine in FIGURINES})
 | |
|             self.add_locations(shop_locations, MessengerShopLocation)
 | |
|         elif self.name == "Tower HQ":
 | |
|             locations.append("Money Wrench")
 | |
|         if world.options.shuffle_seals and self.name in SEALS:
 | |
|             locations += [seal_loc for seal_loc in SEALS[self.name]]
 | |
|         if world.options.shuffle_shards and self.name in MEGA_SHARDS:
 | |
|             locations += [shard for shard in MEGA_SHARDS[self.name]]
 | |
|         loc_dict = {loc: world.location_name_to_id[loc] if loc in world.location_name_to_id else None
 | |
|                     for loc in locations}
 | |
|         self.add_locations(loc_dict, MessengerLocation)
 | |
|         world.multiworld.regions.append(self)
 | |
| 
 | |
| 
 | |
| class MessengerLocation(Location):
 | |
|     game = "The Messenger"
 | |
| 
 | |
|     def __init__(self, player: int, name: str, loc_id: Optional[int], parent: MessengerRegion) -> None:
 | |
|         super().__init__(player, name, loc_id, parent)
 | |
|         if loc_id is None:
 | |
|             self.place_locked_item(MessengerItem(name, parent.player, None))
 | |
| 
 | |
| 
 | |
| class MessengerShopLocation(MessengerLocation):
 | |
|     @cached_property
 | |
|     def cost(self) -> int:
 | |
|         name = self.name.replace("The Shop - ", "")  # TODO use `remove_prefix` when 3.8 finally gets dropped
 | |
|         world = cast("MessengerWorld", self.parent_region.multiworld.worlds[self.player])
 | |
|         # short circuit figurines which all require demon's bane be purchased, but nothing else
 | |
|         if "Figurine" in name:
 | |
|             return world.figurine_prices[name] +\
 | |
|                 cast(MessengerShopLocation, world.multiworld.get_location("The Shop - Demon's Bane", self.player)).cost
 | |
|         shop_data = SHOP_ITEMS[name]
 | |
|         if shop_data.prerequisite:
 | |
|             prereq_cost = 0
 | |
|             if isinstance(shop_data.prerequisite, set):
 | |
|                 for prereq in shop_data.prerequisite:
 | |
|                     prereq_cost +=\
 | |
|                         cast(MessengerShopLocation,
 | |
|                              world.multiworld.get_location(prereq, self.player)).cost
 | |
|             else:
 | |
|                 prereq_cost +=\
 | |
|                     cast(MessengerShopLocation,
 | |
|                          world.multiworld.get_location(shop_data.prerequisite, self.player)).cost
 | |
|             return world.shop_prices[name] + prereq_cost
 | |
|         return world.shop_prices[name]
 | |
| 
 | |
|     def can_afford(self, state: CollectionState) -> bool:
 | |
|         world = cast("MessengerWorld", state.multiworld.worlds[self.player])
 | |
|         can_afford = state.has("Shards", self.player, min(self.cost, world.total_shards))
 | |
|         if "Figurine" in self.name:
 | |
|             can_afford = state.has("Money Wrench", self.player) and can_afford\
 | |
|                 and state.can_reach("Money Wrench", "Location", self.player)
 | |
|         return can_afford
 | |
| 
 | |
| 
 | |
| class MessengerItem(Item):
 | |
|     game = "The Messenger"
 | |
| 
 | |
|     def __init__(self, name: str, player: int, item_id: Optional[int] = None, override_progression: bool = False,
 | |
|                  count: int = 0) -> None:
 | |
|         if count:
 | |
|             item_class = ItemClassification.progression_skip_balancing
 | |
|         elif item_id is None or override_progression or name in {*NOTES, *PROG_ITEMS, *PHOBEKINS, *PROG_SHOP_ITEMS}:
 | |
|             item_class = ItemClassification.progression
 | |
|         elif name in {*USEFUL_ITEMS, *USEFUL_SHOP_ITEMS}:
 | |
|             item_class = ItemClassification.useful
 | |
|         else:
 | |
|             item_class = ItemClassification.filler
 | |
|         super().__init__(name, item_class, item_id, player)
 |