 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>
		
			
				
	
	
		
			151 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			151 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from dataclasses import dataclass
 | |
| from typing import Dict
 | |
| 
 | |
| from schema import And, Optional, Or, Schema
 | |
| 
 | |
| from Options import Accessibility, Choice, DeathLink, DefaultOnToggle, OptionDict, PerGameCommonOptions, Range, \
 | |
|     StartInventoryPool, Toggle
 | |
| 
 | |
| 
 | |
| class MessengerAccessibility(Accessibility):
 | |
|     default = Accessibility.option_locations
 | |
|     # defaulting to locations accessibility since items makes certain items self-locking
 | |
|     __doc__ = Accessibility.__doc__.replace(f"default {Accessibility.default}", f"default {default}")
 | |
| 
 | |
| 
 | |
| class Logic(Choice):
 | |
|     """
 | |
|     The level of logic to use when determining what locations in your world are accessible.
 | |
| 
 | |
|     Normal: can require damage boosts, but otherwise approachable for someone who has beaten the game.
 | |
|     Hard: has leashing, normal clips, time warps and turtle boosting in logic.
 | |
|     OoB: places everything with the minimum amount of rules possible. Expect to do OoB. Not guaranteed completable.
 | |
|     """
 | |
|     display_name = "Logic Level"
 | |
|     option_normal = 0
 | |
|     option_hard = 1
 | |
|     option_oob = 2
 | |
|     alias_challenging = 1
 | |
| 
 | |
| 
 | |
| class PowerSeals(DefaultOnToggle):
 | |
|     """Whether power seal locations should be randomized."""
 | |
|     display_name = "Shuffle Seals"
 | |
| 
 | |
| 
 | |
| class MegaShards(Toggle):
 | |
|     """Whether mega shards should be item locations."""
 | |
|     display_name = "Shuffle Mega Time Shards"
 | |
| 
 | |
| 
 | |
| class Goal(Choice):
 | |
|     """Requirement to finish the game. Power Seal Hunt will force power seal locations to be shuffled."""
 | |
|     display_name = "Goal"
 | |
|     option_open_music_box = 0
 | |
|     option_power_seal_hunt = 1
 | |
| 
 | |
| 
 | |
| class MusicBox(DefaultOnToggle):
 | |
|     """Whether the music box gauntlet needs to be done."""
 | |
|     display_name = "Music Box Gauntlet"
 | |
| 
 | |
| 
 | |
| class NotesNeeded(Range):
 | |
|     """How many notes are needed to access the Music Box."""
 | |
|     display_name = "Notes Needed"
 | |
|     range_start = 1
 | |
|     range_end = 6
 | |
|     default = range_end
 | |
| 
 | |
| 
 | |
| class AmountSeals(Range):
 | |
|     """Number of power seals that exist in the item pool when power seal hunt is the goal."""
 | |
|     display_name = "Total Power Seals"
 | |
|     range_start = 1
 | |
|     range_end = 85
 | |
|     default = 45
 | |
| 
 | |
| 
 | |
| class RequiredSeals(Range):
 | |
|     """Percentage of total seals required to open the shop chest."""
 | |
|     display_name = "Percent Seals Required"
 | |
|     range_start = 10
 | |
|     range_end = 100
 | |
|     default = range_end
 | |
| 
 | |
| 
 | |
| class ShopPrices(Range):
 | |
|     """Percentage modifier for shuffled item prices in shops"""
 | |
|     display_name = "Shop Prices Modifier"
 | |
|     range_start = 25
 | |
|     range_end = 400
 | |
|     default = 100
 | |
| 
 | |
| 
 | |
| def planned_price(location: str) -> Dict[Optional, Or]:
 | |
|     return {
 | |
|         Optional(location): Or(
 | |
|             And(int, lambda n: n >= 0),
 | |
|             {
 | |
|                 Optional(And(int, lambda n: n >= 0)): And(int, lambda n: n >= 0)
 | |
|             }
 | |
|         )
 | |
|     }
 | |
| 
 | |
| 
 | |
| class PlannedShopPrices(OptionDict):
 | |
|     """Plan specific prices on shop slots. Supports weighting"""
 | |
|     display_name = "Shop Price Plando"
 | |
|     schema = Schema({
 | |
|         **planned_price("Karuta Plates"),
 | |
|         **planned_price("Serendipitous Bodies"),
 | |
|         **planned_price("Path of Resilience"),
 | |
|         **planned_price("Kusari Jacket"),
 | |
|         **planned_price("Energy Shuriken"),
 | |
|         **planned_price("Serendipitous Minds"),
 | |
|         **planned_price("Prepared Mind"),
 | |
|         **planned_price("Meditation"),
 | |
|         **planned_price("Rejuvenative Spirit"),
 | |
|         **planned_price("Centered Mind"),
 | |
|         **planned_price("Strike of the Ninja"),
 | |
|         **planned_price("Second Wind"),
 | |
|         **planned_price("Currents Master"),
 | |
|         **planned_price("Aerobatics Warrior"),
 | |
|         **planned_price("Demon's Bane"),
 | |
|         **planned_price("Devil's Due"),
 | |
|         **planned_price("Time Sense"),
 | |
|         **planned_price("Power Sense"),
 | |
|         **planned_price("Focused Power Sense"),
 | |
|         **planned_price("Green Kappa Figurine"),
 | |
|         **planned_price("Blue Kappa Figurine"),
 | |
|         **planned_price("Ountarde Figurine"),
 | |
|         **planned_price("Red Kappa Figurine"),
 | |
|         **planned_price("Demon King Figurine"),
 | |
|         **planned_price("Quillshroom Figurine"),
 | |
|         **planned_price("Jumping Quillshroom Figurine"),
 | |
|         **planned_price("Scurubu Figurine"),
 | |
|         **planned_price("Jumping Scurubu Figurine"),
 | |
|         **planned_price("Wallaxer Figurine"),
 | |
|         **planned_price("Barmath'azel Figurine"),
 | |
|         **planned_price("Queen of Quills Figurine"),
 | |
|         **planned_price("Demon Hive Figurine"),
 | |
|     })
 | |
| 
 | |
| 
 | |
| @dataclass
 | |
| class MessengerOptions(PerGameCommonOptions):
 | |
|     accessibility: MessengerAccessibility
 | |
|     start_inventory: StartInventoryPool
 | |
|     logic_level: Logic
 | |
|     shuffle_seals: PowerSeals
 | |
|     shuffle_shards: MegaShards
 | |
|     goal: Goal
 | |
|     music_box: MusicBox
 | |
|     notes_needed: NotesNeeded
 | |
|     total_seals: AmountSeals
 | |
|     percent_seals_required: RequiredSeals
 | |
|     shop_price: ShopPrices
 | |
|     shop_price_plan: PlannedShopPrices
 | |
|     death_link: DeathLink
 | |
| 
 |