 d20d09e682
			
		
	
	d20d09e682
	
	
	
		
			
			* 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 * Messenger: Limited Movement option first draft * The Messenger: add automated setup through the launcher * drop tomllib * don't uselessly import launcher * The Messenger: fix missing goal requirement for power seal hunt * make hard mode goal harder * make fire seal a bit more lenient * have limited movement force minimal accessibility * add an early meditation option * clean up precollected notes tests a bit * add linux support * add steam deck support * await monokickstart * minor styling cleanup * more minor styling cleanup * Initial implementation of Generic ER * Move ERType to Entrance.Type, fix typing imports * updates based on testing (read: flailing) * Updates from feedback * Various bug fixes in ERCollectionState * Use deque instead of queue.Queue * Allow partial entrances in collection state earlier, doc improvements * Prevent early loops in region graph, improve reusability of ER stage code * Typos, grammar, PEP8, and style "fixes" * use RuntimeError instead of bare Exceptions * return tuples from connect since it's slightly faster for our purposes * move the shuffle to the beginning of find_pairing * do er_state placements within pairing lookups to remove code duplication * requested adjustments * Add some temporary performance logging * Use CollectionState to track available exits and placed regions * remove seal shuffle option * some cleanup stuff * portal rando progress * pre-emptive region creation * seals need to be in the datapackage * put mega shards in old order * fix typos and make it actually work * fix more missed connections and add portal events * fix all the portal rando code * finish initial logic implementation * remove/comment out debug stuff * does not actually support plando yet * typos and fix a crash when 3 available portals was selected * finish initial logic for all connections and remove/rename as necessary * fix typos and add some more leniency * move item classification determination to its own method rather than split between two spots * super complicated solution for handling installing the alpha builds * fix logic bugs and add a test * implement logic to shuffle the cutscene portals even though it's probably not possible * just use the one list * fix some issues with the mod checking/downloading * Core: have webhost slot name links go through the launcher so that components can use them * add uri support to the launcher component function * generate output file under specific conditions * cleanup connections.py * set topology_present to true when portals are shuffled * add requirement for ghost pit loc since it's pretty hard without movement * bring hard logic back * misc cleanup * fix asset grabbing of latest version * implement ER * just use the entrances for the spoiler instead of manipulating the cache * remove test defaults * remove excessive comprehension * cleanup and cater data for the client * add elemental skylands to the shuffle pools * initial attempts at hint text * use network items for offline seeds * change around the offline seed data again * move er after portal shuffle and ensure a minimal sphere 1 * Add a method to automatically disconnect entrances in a coupled-compliant way Update docs and cleanup todos * Make find_placeable_exits deterministic by sorting blocked_connections set * add more ER transitions * fix spoiler output of portal warps * add path to hint_data * rename entrance to tot to be a bit clearer * cleanup imports and update description for hard logic * cleanup for PR to main * missed a spot * cleanup monokickstart * add location_name_groups * update docs for new setup * client can reconnect on its own now, no need for a button. * fix mod download link grabbing the wrong assets * cleanup mod pulling a bit and display version it's trying to update to * plando support * comment out broken steam deck support * supports plando * satisfy flake for currently unused file * fix the items accessibility test * review comments * add searing crags portal to starting portals when disabled like option says * address sliver comments * rip out currently unused transition shuffle * add aerobatics warrior requirement to fire seal --------- 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: Sean Dempsey <dempsey.sean@outlook.com> Co-authored-by: qwint <qwint.42@gmail.com>
		
			
				
	
	
		
			162 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			162 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from .shop import FIGURINES, SHOP_ITEMS
 | |
| 
 | |
| # items
 | |
| # listing individual groups first for easy lookup
 | |
| NOTES = [
 | |
|     "Key of Hope",
 | |
|     "Key of Chaos",
 | |
|     "Key of Courage",
 | |
|     "Key of Love",
 | |
|     "Key of Strength",
 | |
|     "Key of Symbiosis",
 | |
| ]
 | |
| 
 | |
| PROG_ITEMS = [
 | |
|     "Wingsuit",
 | |
|     "Rope Dart",
 | |
|     "Lightfoot Tabi",
 | |
|     "Power Thistle",
 | |
|     "Demon King Crown",
 | |
|     "Ruxxtin's Amulet",
 | |
|     "Magic Firefly",
 | |
|     "Sun Crest",
 | |
|     "Moon Crest",
 | |
|     # "Astral Seed",
 | |
|     # "Astral Tea Leaves",
 | |
|     "Money Wrench",
 | |
|     "Candle",
 | |
|     "Seashell",
 | |
| ]
 | |
| 
 | |
| PHOBEKINS = [
 | |
|     "Necro",
 | |
|     "Pyro",
 | |
|     "Claustro",
 | |
|     "Acro",
 | |
| ]
 | |
| 
 | |
| USEFUL_ITEMS = [
 | |
|     "Windmill Shuriken",
 | |
| ]
 | |
| 
 | |
| FILLER = {
 | |
|     "Time Shard": 5,
 | |
|     "Time Shard (10)": 10,
 | |
|     "Time Shard (50)": 20,
 | |
|     "Time Shard (100)": 20,
 | |
|     "Time Shard (300)": 10,
 | |
|     "Time Shard (500)": 5,
 | |
| }
 | |
| 
 | |
| # item_name_to_id needs to be deterministic and match upstream
 | |
| ALL_ITEMS = [
 | |
|     *NOTES,
 | |
|     "Windmill Shuriken",
 | |
|     "Wingsuit",
 | |
|     "Rope Dart",
 | |
|     "Lightfoot Tabi",
 | |
|     # "Astral Seed",
 | |
|     # "Astral Tea Leaves",
 | |
|     "Candle",
 | |
|     "Seashell",
 | |
|     "Power Thistle",
 | |
|     "Demon King Crown",
 | |
|     "Ruxxtin's Amulet",
 | |
|     "Magic Firefly",
 | |
|     "Sun Crest",
 | |
|     "Moon Crest",
 | |
|     *PHOBEKINS,
 | |
|     "Power Seal",
 | |
|     *FILLER,
 | |
|     *SHOP_ITEMS,
 | |
|     *FIGURINES,
 | |
|     "Money Wrench",
 | |
| ]
 | |
| 
 | |
| # locations
 | |
| # the names of these don't actually matter, but using the upstream's names for now
 | |
| # order must be exactly the same as upstream
 | |
| ALWAYS_LOCATIONS = [
 | |
|     # notes
 | |
|     "Sunken Shrine - Key of Love",
 | |
|     "Corrupted Future - Key of Courage",
 | |
|     "Underworld - Key of Chaos",
 | |
|     "Elemental Skylands - Key of Symbiosis",
 | |
|     "Searing Crags - Key of Strength",
 | |
|     "Autumn Hills - Key of Hope",
 | |
|     # upgrades
 | |
|     "Howling Grotto - Wingsuit",
 | |
|     "Searing Crags - Rope Dart",
 | |
|     "Sunken Shrine - Lightfoot Tabi",
 | |
|     "Autumn Hills - Climbing Claws",
 | |
|     # quest items
 | |
|     "Ninja Village - Astral Seed",
 | |
|     "Searing Crags - Astral Tea Leaves",
 | |
|     "Ninja Village - Candle",
 | |
|     "Quillshroom Marsh - Seashell",
 | |
|     "Searing Crags - Power Thistle",
 | |
|     "Forlorn Temple - Demon King",
 | |
|     "Catacombs - Ruxxtin's Amulet",
 | |
|     "Riviere Turquoise - Butterfly Matriarch",
 | |
|     "Sunken Shrine - Sun Crest",
 | |
|     "Sunken Shrine - Moon Crest",
 | |
|     # phobekins
 | |
|     "Catacombs - Necro",
 | |
|     "Searing Crags - Pyro",
 | |
|     "Bamboo Creek - Claustro",
 | |
|     "Cloud Ruins - Acro",
 | |
|     # seals
 | |
|     "Ninja Village Seal - Tree House",
 | |
|     "Autumn Hills Seal - Trip Saws",
 | |
|     "Autumn Hills Seal - Double Swing Saws",
 | |
|     "Autumn Hills Seal - Spike Ball Swing",
 | |
|     "Autumn Hills Seal - Spike Ball Darts",
 | |
|     "Catacombs Seal - Triple Spike Crushers",
 | |
|     "Catacombs Seal - Crusher Gauntlet",
 | |
|     "Catacombs Seal - Dirty Pond",
 | |
|     "Bamboo Creek Seal - Spike Crushers and Doors",
 | |
|     "Bamboo Creek Seal - Spike Ball Pits",
 | |
|     "Bamboo Creek Seal - Spike Crushers and Doors v2",
 | |
|     "Howling Grotto Seal - Windy Saws and Balls",
 | |
|     "Howling Grotto Seal - Crushing Pits",
 | |
|     "Howling Grotto Seal - Breezy Crushers",
 | |
|     "Quillshroom Marsh Seal - Spikey Window",
 | |
|     "Quillshroom Marsh Seal - Sand Trap",
 | |
|     "Quillshroom Marsh Seal - Do the Spike Wave",
 | |
|     "Searing Crags Seal - Triple Ball Spinner",
 | |
|     "Searing Crags Seal - Raining Rocks",
 | |
|     "Searing Crags Seal - Rhythm Rocks",
 | |
|     "Glacial Peak Seal - Ice Climbers",
 | |
|     "Glacial Peak Seal - Projectile Spike Pit",
 | |
|     "Glacial Peak Seal - Glacial Air Swag",
 | |
|     "Tower of Time Seal - Time Waster",
 | |
|     "Tower of Time Seal - Lantern Climb",
 | |
|     "Tower of Time Seal - Arcane Orbs",
 | |
|     "Cloud Ruins Seal - Ghost Pit",
 | |
|     "Cloud Ruins Seal - Toothbrush Alley",
 | |
|     "Cloud Ruins Seal - Saw Pit",
 | |
|     "Cloud Ruins Seal - Money Farm Room",
 | |
|     "Underworld Seal - Sharp and Windy Climb",
 | |
|     "Underworld Seal - Spike Wall",
 | |
|     "Underworld Seal - Fireball Wave",
 | |
|     "Underworld Seal - Rising Fanta",
 | |
|     "Forlorn Temple Seal - Rocket Maze",
 | |
|     "Forlorn Temple Seal - Rocket Sunset",
 | |
|     "Sunken Shrine Seal - Ultra Lifeguard",
 | |
|     "Sunken Shrine Seal - Waterfall Paradise",
 | |
|     "Sunken Shrine Seal - Tabi Gauntlet",
 | |
|     "Riviere Turquoise Seal - Bounces and Balls",
 | |
|     "Riviere Turquoise Seal - Launch of Faith",
 | |
|     "Riviere Turquoise Seal - Flower Power",
 | |
|     "Elemental Skylands Seal - Air",
 | |
|     "Elemental Skylands Seal - Water",
 | |
|     "Elemental Skylands Seal - Fire",
 | |
| ]
 | |
| 
 | |
| BOSS_LOCATIONS = [
 | |
|     "Autumn Hills - Leaf Golem",
 | |
|     "Catacombs - Ruxxtin",
 | |
|     "Howling Grotto - Emerald Golem",
 | |
|     "Quillshroom Marsh - Queen of Quills",
 | |
| ]
 |