 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>
		
			
				
	
	
		
			101 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			101 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from typing import Dict, List, NamedTuple, Optional, Set, TYPE_CHECKING, Tuple, Union
 | |
| 
 | |
| if TYPE_CHECKING:
 | |
|     from . import MessengerWorld
 | |
| else:
 | |
|     MessengerWorld = object
 | |
| 
 | |
| PROG_SHOP_ITEMS: List[str] = [
 | |
|     "Path of Resilience",
 | |
|     "Meditation",
 | |
|     "Strike of the Ninja",
 | |
|     "Second Wind",
 | |
|     "Currents Master",
 | |
|     "Aerobatics Warrior",
 | |
| ]
 | |
| 
 | |
| USEFUL_SHOP_ITEMS: List[str] = [
 | |
|     "Karuta Plates",
 | |
|     "Serendipitous Bodies",
 | |
|     "Kusari Jacket",
 | |
|     "Energy Shuriken",
 | |
|     "Serendipitous Minds",
 | |
|     "Rejuvenate Spirit",
 | |
|     "Demon's Bane",
 | |
| ]
 | |
| 
 | |
| 
 | |
| class ShopData(NamedTuple):
 | |
|     internal_name: str
 | |
|     min_price: int
 | |
|     max_price: int
 | |
|     prerequisite: Optional[Union[str, Set[str]]] = None
 | |
| 
 | |
| 
 | |
| SHOP_ITEMS: Dict[str, ShopData] = {
 | |
|     "Karuta Plates":        ShopData("HP_UPGRADE_1", 20, 200),
 | |
|     "Serendipitous Bodies": ShopData("ENEMY_DROP_HP", 20, 300, "The Shop - Karuta Plates"),
 | |
|     "Path of Resilience":   ShopData("DAMAGE_REDUCTION", 100, 500, "The Shop - Serendipitous Bodies"),
 | |
|     "Kusari Jacket":        ShopData("HP_UPGRADE_2", 100, 500, "The Shop - Serendipitous Bodies"),
 | |
|     "Energy Shuriken":      ShopData("SHURIKEN", 20, 200),
 | |
|     "Serendipitous Minds":  ShopData("ENEMY_DROP_MANA", 20, 300, "The Shop - Energy Shuriken"),
 | |
|     "Prepared Mind":        ShopData("SHURIKEN_UPGRADE_1", 100, 600, "The Shop - Serendipitous Minds"),
 | |
|     "Meditation":           ShopData("CHECKPOINT_FULL", 100, 600,
 | |
|                                      {"The Shop - Prepared Mind", "The Shop - Kusari Jacket"}),
 | |
|     "Rejuvenative Spirit":  ShopData("POTION_FULL_HEAL_AND_HP", 300, 800, "The Shop - Meditation"),
 | |
|     "Centered Mind":        ShopData("SHURIKEN_UPGRADE_2", 300, 800, "The Shop - Meditation"),
 | |
|     "Strike of the Ninja":  ShopData("ATTACK_PROJECTILE", 20, 200),
 | |
|     "Second Wind":          ShopData("AIR_RECOVER", 20, 350, "The Shop - Strike of the Ninja"),
 | |
|     "Currents Master":      ShopData("SWIM_DASH", 100, 600, "The Shop - Second Wind"),
 | |
|     "Aerobatics Warrior":   ShopData("GLIDE_ATTACK", 300, 800, "The Shop - Currents Master"),
 | |
|     "Demon's Bane":         ShopData("CHARGED_ATTACK", 400, 1000,
 | |
|                                      {"The Shop - Rejuvenative Spirit", "The Shop - Aerobatics Warrior"}),
 | |
|     "Devil's Due":          ShopData("QUARBLE_DISCOUNT_50", 20, 200),
 | |
|     "Time Sense":           ShopData("TIME_WARP", 20, 300),
 | |
|     "Power Sense":          ShopData("POWER_SEAL", 100, 800, "The Shop - Time Sense"),
 | |
|     "Focused Power Sense":  ShopData("POWER_SEAL_WORLD_MAP", 300, 600, "The Shop - Power Sense"),
 | |
| }
 | |
| 
 | |
| FIGURINES: Dict[str, ShopData] = {
 | |
|     "Green Kappa Figurine":         ShopData("GREEN_KAPPA", 100, 500),
 | |
|     "Blue Kappa Figurine":          ShopData("BLUE_KAPPA", 100, 500),
 | |
|     "Ountarde Figurine":            ShopData("OUNTARDE", 100, 500),
 | |
|     "Red Kappa Figurine":           ShopData("RED_KAPPA", 100, 500),
 | |
|     "Demon King Figurine":          ShopData("DEMON_KING", 600, 2000),
 | |
|     "Quillshroom Figurine":         ShopData("QUILLSHROOM", 100, 500),
 | |
|     "Jumping Quillshroom Figurine": ShopData("JUMPING_QUILLSHROOM", 100, 500),
 | |
|     "Scurubu Figurine":             ShopData("SCURUBU", 100, 500),
 | |
|     "Jumping Scurubu Figurine":     ShopData("JUMPING_SCURUBU", 100, 500),
 | |
|     "Wallaxer Figurine":            ShopData("WALLAXER", 100, 500),
 | |
|     "Barmath'azel Figurine":        ShopData("BARMATHAZEL", 600, 2000),
 | |
|     "Queen of Quills Figurine":     ShopData("QUEEN_OF_QUILLS", 400, 1000),
 | |
|     "Demon Hive Figurine":          ShopData("DEMON_HIVE", 100, 500),
 | |
| }
 | |
| 
 | |
| 
 | |
| def shuffle_shop_prices(world: MessengerWorld) -> Tuple[Dict[str, int], Dict[str, int]]:
 | |
|     shop_price_mod = world.options.shop_price.value
 | |
|     shop_price_planned = world.options.shop_price_plan
 | |
| 
 | |
|     shop_prices: Dict[str, int] = {}
 | |
|     figurine_prices: Dict[str, int] = {}
 | |
|     for item, price in shop_price_planned.value.items():
 | |
|         if not isinstance(price, int):
 | |
|             price = world.random.choices(list(price.keys()), weights=list(price.values()))[0]
 | |
|         if "Figurine" in item:
 | |
|             figurine_prices[item] = price
 | |
|         else:
 | |
|             shop_prices[item] = price
 | |
| 
 | |
|     remaining_slots = [item for item in [*SHOP_ITEMS, *FIGURINES] if item not in shop_price_planned.value]
 | |
|     for shop_item in remaining_slots:
 | |
|         shop_data = SHOP_ITEMS.get(shop_item, FIGURINES.get(shop_item))
 | |
|         price = world.random.randint(shop_data.min_price, shop_data.max_price)
 | |
|         adjusted_price = min(int(price * shop_price_mod / 100), 5000)
 | |
|         if "Figurine" in shop_item:
 | |
|             figurine_prices[shop_item] = adjusted_price
 | |
|         else:
 | |
|             shop_prices[shop_item] = adjusted_price
 | |
| 
 | |
|     return shop_prices, figurine_prices
 |