 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>
		
			
				
	
	
		
			36 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from ...strings.craftable_names import Craftable
 | |
| from ...strings.performance_names import Performance
 | |
| from ...strings.skill_names import Skill
 | |
| from ...strings.tool_names import Tool, ToolMaterial
 | |
| from ...strings.ap_names.transport_names import ModTransportation
 | |
| from ...stardew_rule import StardewRule, True_, And
 | |
| from ... import options
 | |
| 
 | |
| 
 | |
| def can_reach_woods_depth(vanilla_logic, depth: int) -> StardewRule:
 | |
|     tier = int(depth / 25) + 1
 | |
|     rules = []
 | |
|     if depth > 10:
 | |
|         rules.append(vanilla_logic.has(Craftable.bomb) | vanilla_logic.has_tool(Tool.axe, ToolMaterial.iridium))
 | |
|     if depth > 30:
 | |
|         rules.append(vanilla_logic.received(ModTransportation.woods_obelisk))
 | |
|     if depth > 50:
 | |
|         rules.append(vanilla_logic.can_do_combat_at_level(Performance.great) & vanilla_logic.can_cook() &
 | |
|                      vanilla_logic.received(ModTransportation.woods_obelisk))
 | |
|     if vanilla_logic.options.skill_progression == options.SkillProgression.option_progressive:
 | |
|         combat_tier = min(10, max(0, tier + 5))
 | |
|         rules.append(vanilla_logic.has_skill_level(Skill.combat, combat_tier))
 | |
|     return And(rules)
 | |
| 
 | |
| 
 | |
| def has_woods_rune_to_depth(vanilla_logic, floor: int) -> StardewRule:
 | |
|     if vanilla_logic.options.elevator_progression == options.ElevatorProgression.option_vanilla:
 | |
|         return True_()
 | |
|     return vanilla_logic.received("Progressive Woods Obelisk Sigils", count=int(floor / 10))
 | |
| 
 | |
| 
 | |
| def can_chop_to_depth(vanilla_logic, floor: int) -> StardewRule:
 | |
|     previous_elevator = max(floor - 10, 0)
 | |
|     return (has_woods_rune_to_depth(vanilla_logic, previous_elevator) &
 | |
|             can_reach_woods_depth(vanilla_logic, previous_elevator))
 |