 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>
		
			
				
	
	
		
			58 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			58 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from BaseClasses import CollectionState, ItemClassification
 | |
| from worlds.alttp.Dungeons import create_dungeons, get_dungeon_item_pool
 | |
| from worlds.alttp.EntranceShuffle import mandatory_connections, connect_simple
 | |
| from worlds.alttp.ItemPool import difficulties
 | |
| from worlds.alttp.Items import ItemFactory
 | |
| from worlds.alttp.Regions import create_regions
 | |
| from worlds.alttp.Shops import create_shops
 | |
| from worlds.alttp.test import LTTPTestBase
 | |
| 
 | |
| 
 | |
| class TestDungeon(LTTPTestBase):
 | |
|     def setUp(self):
 | |
|         self.world_setup()
 | |
|         self.starting_regions = []  # Where to start exploring
 | |
|         self.remove_exits = []      # Block dungeon exits
 | |
|         self.multiworld.difficulty_requirements[1] = difficulties['normal']
 | |
|         create_regions(self.multiworld, 1)
 | |
|         self.multiworld.worlds[1].create_dungeons()
 | |
|         create_shops(self.multiworld, 1)
 | |
|         for exitname, regionname in mandatory_connections:
 | |
|             connect_simple(self.multiworld, exitname, regionname, 1)
 | |
|         connect_simple(self.multiworld, 'Big Bomb Shop', 'Big Bomb Shop', 1)
 | |
|         self.multiworld.get_region('Menu', 1).exits = []
 | |
|         self.multiworld.swamp_patch_required[1] = True
 | |
|         self.multiworld.worlds[1].set_rules()
 | |
|         self.multiworld.worlds[1].create_items()
 | |
|         self.multiworld.itempool.extend(get_dungeon_item_pool(self.multiworld))
 | |
|         self.multiworld.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
 | |
| 
 | |
|     def run_tests(self, access_pool):
 | |
|         for exit in self.remove_exits:
 | |
|             self.multiworld.get_entrance(exit, 1).connected_region = self.multiworld.get_region('Menu', 1)
 | |
| 
 | |
|         for location, access, *item_pool in access_pool:
 | |
|             items = item_pool[0]
 | |
|             all_except = item_pool[1] if len(item_pool) > 1 else None
 | |
|             with self.subTest(location=location, access=access, items=items, all_except=all_except):
 | |
|                 if all_except and len(all_except) > 0:
 | |
|                     items = self.multiworld.itempool[:]
 | |
|                     items = [item for item in items if item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
 | |
|                     items.extend(ItemFactory(item_pool[0], 1))
 | |
|                 else:
 | |
|                     items = ItemFactory(items, 1)
 | |
|                 state = CollectionState(self.multiworld)
 | |
|                 state.reachable_regions[1].add(self.multiworld.get_region('Menu', 1))
 | |
|                 for region_name in self.starting_regions:
 | |
|                     region = self.multiworld.get_region(region_name, 1)
 | |
|                     state.reachable_regions[1].add(region)
 | |
|                     for exit in region.exits:
 | |
|                         if exit.connected_region is not None:
 | |
|                             state.blocked_connections[1].add(exit)
 | |
| 
 | |
|                 for item in items:
 | |
|                     item.classification = ItemClassification.progression
 | |
|                     state.collect(item, event=True)  # event=True prevents running sweep_for_events() and picking up
 | |
|                 state.sweep_for_events()             # key drop keys repeatedly
 | |
| 
 | |
|                 self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access, f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}") |